Merge branch 'master' of alkmene.hbz-nrw.de:joerg/graphics

LICENSE.txt

@@ -1,347 +1,674 @@
-The GNU General Public License (GPL)
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-Version 2, June 1991
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                            Preamble
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-Everyone is permitted to copy and distribute verbatim copies of this license
+  The GNU General Public License is a free, copyleft license for
-document, but changing it is not allowed.
+software and other kinds of works.
 
-Preamble
+  The licenses for most software and other practical works are designed
-
+to take away your freedom to share and change the works.  By contrast,
-The licenses for most software are designed to take away your freedom to share
+the GNU General Public License is intended to guarantee your freedom to
-and change it.  By contrast, the GNU General Public License is intended to
+share and change all versions of a program--to make sure it remains free
-guarantee your freedom to share and change free software--to make sure the
+software for all its users.  We, the Free Software Foundation, use the
-software is free for all its users.  This General Public License applies to
+GNU General Public License for most of our software; it applies also to
-most of the Free Software Foundation's software and to any other program whose
+any other work released this way by its authors.  You can apply it to
-authors commit to using it.  (Some other Free Software Foundation software is
-covered by the GNU Library General Public License instead.) You can apply it to
 your programs, too.
 
-When we speak of free software, we are referring to freedom, not price.  Our
+  When we speak of free software, we are referring to freedom, not
-General Public Licenses are designed to make sure that you have the freedom to
+price.  Our General Public Licenses are designed to make sure that you
-distribute copies of free software (and charge for this service if you wish),
+have the freedom to distribute copies of free software (and charge for
-that you receive source code or can get it if you want it, that you can change
+them if you wish), that you receive source code or can get it if you
-the software or use pieces of it in new free programs; and that you know you
+want it, that you can change the software or use pieces of it in new
-can do these things.
+free programs, and that you know you can do these things.
 
-To protect your rights, we need to make restrictions that forbid anyone to deny
+  To protect your rights, we need to prevent others from denying you
-you these rights or to ask you to surrender the rights.  These restrictions
+these rights or asking you to surrender the rights.  Therefore, you have
-translate to certain responsibilities for you if you distribute copies of the
+certain responsibilities if you distribute copies of the software, or if
-software, or if you modify it.
+you modify it: responsibilities to respect the freedom of others.
 
-For example, if you distribute copies of such a program, whether gratis or for
+  For example, if you distribute copies of such a program, whether
-a fee, you must give the recipients all the rights that you have.  You must
+gratis or for a fee, you must pass on to the recipients the same
-make sure that they, too, receive or can get the source code.  And you must
+freedoms that you received.  You must make sure that they, too, receive
-show them these terms so they know their rights.
+or can get the source code.  And you must show them these terms so they
+know their rights.
 
-We protect your rights with two steps: (1) copyright the software, and (2)
+  Developers that use the GNU GPL protect your rights with two steps:
-offer you this license which gives you legal permission to copy, distribute
+(1) assert copyright on the software, and (2) offer you this License
-and/or modify the software.
+giving you legal permission to copy, distribute and/or modify it.
 
-Also, for each author's protection and ours, we want to make certain that
+  For the developers' and authors' protection, the GPL clearly explains
-everyone understands that there is no warranty for this free software.  If the
+that there is no warranty for this free software.  For both users' and
-software is modified by someone else and passed on, we want its recipients to
+authors' sake, the GPL requires that modified versions be marked as
-know that what they have is not the original, so that any problems introduced
+changed, so that their problems will not be attributed erroneously to
-by others will not reflect on the original authors' reputations.
+authors of previous versions.
 
-Finally, any free program is threatened constantly by software patents.  We
+  Some devices are designed to deny users access to install or run
-wish to avoid the danger that redistributors of a free program will
+modified versions of the software inside them, although the manufacturer
-individually obtain patent licenses, in effect making the program proprietary.
+can do so.  This is fundamentally incompatible with the aim of
-To prevent this, we have made it clear that any patent must be licensed for
+protecting users' freedom to change the software.  The systematic
-everyone's free use or not licensed at all.
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
 
-The precise terms and conditions for copying, distribution and modification
+  Finally, every program is threatened constantly by software patents.
-follow.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
 
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+  The precise terms and conditions for copying, distribution and
+modification follow.
 
-0. This License applies to any program or other work which contains a notice
+                       TERMS AND CONDITIONS
-placed by the copyright holder saying it may be distributed under the terms of
-this General Public License.  The "Program", below, refers to any such program
-or work, and a "work based on the Program" means either the Program or any
-derivative work under copyright law: that is to say, a work containing the
-Program or a portion of it, either verbatim or with modifications and/or
-translated into another language.  (Hereinafter, translation is included
-without limitation in the term "modification".) Each licensee is addressed as
-"you".
 
-Activities other than copying, distribution and modification are not covered by
+  0. Definitions.
-this License; they are outside its scope.  The act of running the Program is
-not restricted, and the output from the Program is covered only if its contents
-constitute a work based on the Program (independent of having been made by
-running the Program).  Whether that is true depends on what the Program does.
 
-1. You may copy and distribute verbatim copies of the Program's source code as
+  "This License" refers to version 3 of the GNU General Public License.
-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 give any other recipients of the
-Program a copy of this License along with the Program.
 
-You may charge a fee for the physical act of transferring a copy, and you may
+  "Copyright" also means copyright-like laws that apply to other kinds of
-at your option offer warranty protection in exchange for a fee.
+works, such as semiconductor masks.
 
-2. You may modify your copy or copies of the Program or any portion of it, thus
+  "The Program" refers to any copyrightable work licensed under this
-forming a work based on the Program, and copy and distribute such modifications
+License.  Each licensee is addressed as "you".  "Licensees" and
-or work under the terms of Section 1 above, provided that you also meet all of
+"recipients" may be individuals or organizations.
-these conditions:
 
-    a) You must cause the modified files to carry prominent notices stating
+  To "modify" a work means to copy from or adapt all or part of the work
-    that you changed the files and the date of any change.
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
 
-    b) You must cause any work that you distribute or publish, that in whole or
+  A "covered work" means either the unmodified Program or a work based
-    in part contains or is derived from the Program or any part thereof, to be
+on the Program.
-    licensed as a whole at no charge to all third parties under the terms of
-    this License.
 
-    c) If the modified program normally reads commands interactively when run,
+  To "propagate" a work means to do anything with it that, without
-    you must cause it, when started running for such interactive use in the
+permission, would make you directly or secondarily liable for
-    most ordinary way, to print or display an announcement including an
+infringement under applicable copyright law, except executing it on a
-    appropriate copyright notice and a notice that there is no warranty (or
+computer or modifying a private copy.  Propagation includes copying,
-    else, saying that you provide a warranty) and that users may redistribute
+distribution (with or without modification), making available to the
-    the program under these conditions, and telling the user how to view a copy
+public, and in some countries other activities as well.
-    of this License.  (Exception: if the Program itself is interactive but does
-    not normally print such an announcement, your work based on the Program is
-    not required to print an announcement.)
 
-These requirements apply to the modified work as a whole.  If identifiable
+  To "convey" a work means any kind of propagation that enables other
-sections of that work are not derived from the Program, and can be reasonably
+parties to make or receive copies.  Mere interaction with a user through
-considered independent and separate works in themselves, then this License, and
+a computer network, with no transfer of a copy, is not conveying.
-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 Program, 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
+  An interactive user interface displays "Appropriate Legal Notices"
-rights to work written entirely by you; rather, the intent is to exercise the
+to the extent that it includes a convenient and prominently visible
-right to control the distribution of derivative or collective works based on
+feature that (1) displays an appropriate copyright notice, and (2)
-the Program.
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
 
-In addition, mere aggregation of another work not based on the Program with the
+  1. Source Code.
-Program (or with a work based on the Program) on a volume of a storage or
-distribution medium does not bring the other work under the scope of this
-License.
 
-3. You may copy and distribute the Program (or a work based on it, under
+  The "source code" for a work means the preferred form of the work
-Section 2) in object code or executable form under the terms of Sections 1 and
+for making modifications to it.  "Object code" means any non-source
-2 above provided that you also do one of the following:
+form of a work.
 
-    a) Accompany it with the complete corresponding machine-readable source
+  A "Standard Interface" means an interface that either is an official
-    code, which must be distributed under the terms of Sections 1 and 2 above
+standard defined by a recognized standards body, or, in the case of
-    on a medium customarily used for software interchange; or,
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
 
-    b) Accompany it with a written offer, valid for at least three years, to
+  The "System Libraries" of an executable work include anything, other
-    give any third party, for a charge no more than your cost of physically
+than the work as a whole, that (a) is included in the normal form of
-    performing source distribution, a complete machine-readable copy of the
+packaging a Major Component, but which is not part of that Major
-    corresponding source code, to be distributed under the terms of Sections 1
+Component, and (b) serves only to enable use of the work with that
-    and 2 above on a medium customarily used for software interchange; or,
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
 
-    c) Accompany it with the information you received as to the offer to
+  The "Corresponding Source" for a work in object code form means all
-    distribute corresponding source code.  (This alternative is allowed only
+the source code needed to generate, install, and (for an executable
-    for noncommercial distribution and only if you received the program in
+work) run the object code and to modify the work, including scripts to
-    object code or executable form with such an offer, in accord with
+control those activities.  However, it does not include the work's
-    Subsection b above.)
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
 
-The source code for a work means the preferred form of the work for making
+  The Corresponding Source need not include anything that users
-modifications to it.  For an executable work, complete source code means all
+can regenerate automatically from other parts of the Corresponding
-the source code for all modules it contains, plus any associated interface
+Source.
-definition files, plus the scripts used to control compilation and installation
-of the executable.  However, as a special exception, the source code
-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.
 
-If distribution of executable or object code is made by offering access to copy
+  The Corresponding Source for a work in source code form is that
-from a designated place, then offering equivalent access to copy the source
+same work.
-code from the same place counts as distribution of the source code, even though
-third parties are not compelled to copy the source along with the object code.
 
-4. You may not copy, modify, sublicense, or distribute the Program except as
+  2. Basic Permissions.
-expressly provided under this License.  Any attempt otherwise to copy, modify,
-sublicense or distribute the Program 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.
 
-5. You are not required to accept this License, since you have not signed it.
+  All rights granted under this License are granted for the term of
-However, nothing else grants you permission to modify or distribute the Program
+copyright on the Program, and are irrevocable provided the stated
-or its derivative works.  These actions are prohibited by law if you do not
+conditions are met.  This License explicitly affirms your unlimited
-accept this License.  Therefore, by modifying or distributing the Program (or
+permission to run the unmodified Program.  The output from running a
-any work based on the Program), you indicate your acceptance of this License to
+covered work is covered by this License only if the output, given its
-do so, and all its terms and conditions for copying, distributing or modifying
+content, constitutes a covered work.  This License acknowledges your
-the Program or works based on it.
+rights of fair use or other equivalent, as provided by copyright law.
 
-6. Each time you redistribute the Program (or any work based on the Program),
+  You may make, run and propagate covered works that you do not
-the recipient automatically receives a license from the original licensor to
+convey, without conditions so long as your license otherwise remains
-copy, distribute or modify the Program subject to these terms and conditions.
+in force.  You may convey covered works to others for the sole purpose
-You may not impose any further restrictions on the recipients' exercise of the
+of having them make modifications exclusively for you, or provide you
-rights granted herein.  You are not responsible for enforcing compliance by
+with facilities for running those works, provided that you comply with
-third parties to this License.
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
 
-7. If, as a consequence of a court judgment or allegation of patent
+  Conveying under any other circumstances is permitted solely under
-infringement or for any other reason (not limited to patent issues), conditions
+the conditions stated below.  Sublicensing is not allowed; section 10
-are imposed on you (whether by court order, agreement or otherwise) that
+makes it unnecessary.
-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 Program at all.
-For example, if a patent license would not permit royalty-free redistribution
-of the Program 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 Program.
 
-If any portion of this section is held invalid or unenforceable under any
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-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
+  No covered work shall be deemed part of an effective technological
-other property right claims or to contest validity of any such claims; this
+measure under any applicable law fulfilling obligations under article
-section has the sole purpose of protecting the integrity of the free software
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
-distribution system, which is implemented by public license practices.  Many
+similar laws prohibiting or restricting circumvention of such
-people have made generous contributions to the wide range of software
+measures.
-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
+  When you convey a covered work, you waive any legal power to forbid
-consequence of the rest of this License.
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
 
-8. If the distribution and/or use of the Program is restricted in certain
+  4. Conveying Verbatim Copies.
-countries either by patents or by copyrighted interfaces, the original
-copyright holder who places the Program 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.
 
-9. The Free Software Foundation may publish revised and/or new versions of the
+  You may convey verbatim copies of the Program's source code as you
-General Public License from time to time.  Such new versions will be similar in
+receive it, in any medium, provided that you conspicuously and
-spirit to the present version, but may differ in detail to address new problems
+appropriately publish on each copy an appropriate copyright notice;
-or concerns.
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
 
-Each version is given a distinguishing version number.  If the Program
+  You may charge any price or no price for each copy that you convey,
-specifies a version number of this License which applies to it and "any later
+and you may offer support or warranty protection for a fee.
-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 Program does not specify a version number of this License, you may
-choose any version ever published by the Free Software Foundation.
 
-10. If you wish to incorporate parts of the Program into other free programs
+  5. Conveying Modified Source Versions.
-whose distribution conditions are different, 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
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
 
-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+    a) The work must carry prominent notices stating that you modified
-THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE
+    it, and giving a relevant date.
-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
-PROGRAM "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 PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE,
-YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+    b) The work must carry prominent notices stating that it is
-ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
+    released under this License and any conditions added under section
-PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+    7.  This requirement modifies the requirement in section 4 to
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+    "keep intact all notices".
-INABILITY TO USE THE PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
-OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
-END OF TERMS AND CONDITIONS
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
 
-How to Apply These Terms to Your New Programs
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
 
-If you develop a new program, and you want it to be of the greatest possible
+  A compilation of a covered work with other separate and independent
-use to the public, the best way to achieve this is to make it free software
+works, which are not by their nature extensions of the covered work,
-which everyone can redistribute and change under these terms.
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
 
-To do so, attach the following notices to the program.  It is safest to attach
+  6. Conveying Non-Source Forms.
-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 program's name and a brief idea of what it does.
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
 
-    Copyright (C) <year> <name of author>
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
 
-    This program is free software; you can redistribute it and/or modify it
+    b) Convey the object code in, or embodied in, a physical product
-    under the terms of the GNU General Public License as published by the Free
+    (including a physical distribution medium), accompanied by a
-    Software Foundation; either version 2 of the License, or (at your option)
+    written offer, valid for at least three years and valid for as
-    any later version.
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
 
-    This program is distributed in the hope that it will be useful, but WITHOUT
+    c) Convey individual copies of the object code with a copy of the
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    written offer to provide the Corresponding Source.  This
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+    alternative is allowed only occasionally and noncommercially, and
-    more details.
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
 
-    You should have received a copy of the GNU General Public License along
+    d) Convey the object code by offering access from a designated
-    with this program; if not, write to the Free Software Foundation, Inc., 59
+    place (gratis or for a charge), and offer equivalent access to the
-    Temple Place, Suite 330, Boston, MA 02111-1307 USA
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state 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 program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
-If the program is interactive, make it output a short notice like this when it
+  If the program does terminal interaction, make it output a short
-starts in an interactive mode:
+notice like this when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
+    <program>  Copyright (C) <year>  <name of author>
-    with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    software, and you are welcome to redistribute it under certain conditions;
+    This is free software, and you are welcome to redistribute it
-    type 'show c' for details.
+    under certain conditions; type `show c' for details.
 
-The hypothetical commands 'show w' and 'show c' should show the appropriate
+The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may be
+parts of the General Public License.  Of course, your program's commands
-called something other than 'show w' and 'show c'; they could even be
+might be different; for a GUI interface, you would use an "about box".
-mouse-clicks or menu items--whatever suits your program.
 
-You should also get your employer (if you work as a programmer) or your school,
+  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.  Here
+if any, to sign a "copyright disclaimer" for the program, if necessary.
-is a sample; alter the names:
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
 
-    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  The GNU General Public License does not permit incorporating your program
-    'Gnomovision' (which makes passes at compilers) written by James Hacker.
+into proprietary programs.  If your program is a subroutine library, you
-
+may consider it more useful to permit linking proprietary applications with
-    signature of Ty Coon, 1 April 1989
+the library.  If this is what you want to do, use the GNU Lesser General
-
+Public License instead of this License.  But first, please read
-    Ty Coon, President of Vice
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General Public
-License instead of this License.
-
-
-"CLASSPATH" EXCEPTION TO THE GPL
-
-Certain source files distributed by Oracle America and/or its affiliates are
-subject to the following clarification and special exception to the GPL, but
-only where Oracle has expressly included in the particular source file's header
-the words "Oracle designates this particular file as subject to the "Classpath"
-exception as provided by Oracle in the LICENSE file that accompanied this code."
-
-    Linking this library statically or dynamically with other modules is making
-    a combined work based on this library.  Thus, the terms and conditions of
-    the GNU General Public License cover the whole combination.
-
-    As a special exception, the copyright holders of this library give you
-    permission to link this library with independent modules to produce an
-    executable, regardless of the license terms of these independent modules,
-    and to copy and distribute the resulting executable under terms of your
-    choice, provided that you also meet, for each linked independent module,
-    the terms and conditions of the license of that module.  An independent
-    module is a module which is not derived from or based on this library.  If
-    you modify this library, you may extend this exception to your version of
-    the library, but you are not obligated to do so.  If you do not wish to do
-    so, delete this exception statement from your version.

barcode/src/main/java/org/xbib/graphics/barcode/render/GraphicsRenderer.java

@@ -8,6 +8,7 @@ import java.awt.Color;
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics2D;
+import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.font.TextAttribute;
 import java.awt.geom.Ellipse2D;
@@ -27,6 +28,8 @@ public class GraphicsRenderer {
      */
     private final Graphics2D g2d;
 
+    private final Rectangle rectangle;
+
     /**
      * The scaling factor.
      */
@@ -56,12 +59,14 @@ public class GraphicsRenderer {
      * @param antialias if true give anti alias hint
      */
     public GraphicsRenderer(Graphics2D g2d,
+                            Rectangle rectangle,
                             double scalingFactor,
                             Color background,
                             Color foreground,
                             boolean antialias,
                             boolean transparentBackground) {
         this.g2d = g2d;
+        this.rectangle = rectangle;
         this.scalingFactor = scalingFactor;
         this.background = background;
         this.foreground = foreground;
@@ -83,7 +88,7 @@ public class GraphicsRenderer {
         g2d.setBackground(background);
         if (!transparentBackground) {
             g2d.setColor(background);
-            g2d.fill(g2d.getDeviceConfiguration().getBounds());
+            g2d.fill(rectangle);
             g2d.setColor(foreground);
         }
         for (Rectangle2D.Double rect : symbol.getRectangles()) {

barcode/src/test/java/org/xbib/graphics/barcode/SymbolTest.java

@@ -30,6 +30,7 @@ import java.awt.Font;
 import java.awt.FontFormatException;
 import java.awt.Graphics2D;
 import java.awt.GraphicsEnvironment;
+import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.FilenameFilter;
@@ -407,8 +408,10 @@ public class SymbolTest {
         int height = (int) (symbol.getHeight() * scalingFactor);
         if (width > 0 && height > 0) {
             BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_BYTE_GRAY);
+            Rectangle rectangle = new Rectangle(0, 0, img.getWidth(), img.getHeight());
             Graphics2D g2d = img.createGraphics();
-            GraphicsRenderer renderer = new GraphicsRenderer(g2d, scalingFactor, Color.WHITE, Color.BLACK, true, false);
+            GraphicsRenderer renderer = new GraphicsRenderer(g2d, rectangle,
+                    scalingFactor, Color.WHITE, Color.BLACK, true, false);
             renderer.render(symbol);
             g2d.dispose();
             return img;

barcode/src/test/java/org/xbib/graphics/barcode/output/Code39Test.java

@@ -6,6 +6,7 @@ import org.xbib.graphics.barcode.HumanReadableLocation;
 import org.xbib.graphics.barcode.render.GraphicsRenderer;
 import java.awt.Color;
 import java.awt.Graphics2D;
+import java.awt.Rectangle;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -51,6 +52,7 @@ public class Code39Test {
 
     private GraphicsRenderer createRenderer(BufferedImage bufferedImage, double scalingFactor) {
         Graphics2D g2d = bufferedImage.createGraphics();
-        return new GraphicsRenderer(g2d, scalingFactor, Color.WHITE, Color.BLACK, false, false);
+        Rectangle rectangle = new Rectangle(0, 0, bufferedImage.getWidth(), bufferedImage.getHeight());
+        return new GraphicsRenderer(g2d, rectangle, scalingFactor, Color.WHITE, Color.BLACK, false, false);
     }
 }

barcode/src/test/java/org/xbib/graphics/barcode/output/EPSRendererTest.java

@@ -10,6 +10,8 @@ import org.xbib.graphics.barcode.MaxiCode;
 import org.xbib.graphics.barcode.Symbol;
 import org.xbib.graphics.io.vector.eps.EPSGraphics2D;
 import java.awt.Color;
+import java.awt.Font;
+import java.awt.Rectangle;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -91,8 +93,11 @@ public class EPSRendererTest {
         symbol.setQuietZoneVertical(margin);
         int width = (int) (symbol.getWidth() * magnification);
         int height = (int) (symbol.getHeight() * magnification);
-        EPSGraphics2D epsGraphics2D = new EPSGraphics2D(0, 0, width, height);
+        Rectangle rectangle = new Rectangle(0, 0, width, height);
-        GraphicsRenderer graphicsRenderer = new GraphicsRenderer(epsGraphics2D, magnification, paper, ink, false, false);
+        EPSGraphics2D epsGraphics2D = new EPSGraphics2D(rectangle);
+        epsGraphics2D.setFont(new Font(Font.SANS_SERIF, Font.PLAIN, 12));
+        GraphicsRenderer graphicsRenderer = new GraphicsRenderer(epsGraphics2D, rectangle,
+                magnification, paper, ink, false, false);
         graphicsRenderer.render(symbol);
         graphicsRenderer.close();
         byte[] actualBytes = epsGraphics2D.getBytes();

barcode/src/test/java/org/xbib/graphics/barcode/output/PDFRendererTest.java

@@ -10,6 +10,8 @@ import org.xbib.graphics.barcode.Symbol;
 import org.xbib.graphics.barcode.render.GraphicsRenderer;
 import org.xbib.graphics.io.vector.pdf.PDFGraphics2D;
 import java.awt.Color;
+import java.awt.Font;
+import java.awt.Rectangle;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -91,8 +93,11 @@ public class PDFRendererTest {
         symbol.setQuietZoneVertical(margin);
         int width = (int) (symbol.getWidth() * magnification);
         int height = (int) (symbol.getHeight() * magnification);
-        PDFGraphics2D pdfGraphics2D = new PDFGraphics2D(0, 0, width, height);
+        Rectangle rectangle = new Rectangle(0, 0, width, height);
-        GraphicsRenderer graphicsRenderer = new GraphicsRenderer(pdfGraphics2D, magnification, paper, ink, false, false);
+        PDFGraphics2D pdfGraphics2D = new PDFGraphics2D(rectangle);
+        pdfGraphics2D.setFont(new Font(Font.SANS_SERIF, Font.PLAIN, 12));
+        GraphicsRenderer graphicsRenderer = new GraphicsRenderer(pdfGraphics2D,
+                rectangle, magnification, paper, ink, false, false);
         graphicsRenderer.render(symbol);
         graphicsRenderer.close();
         byte[] actualBytes = pdfGraphics2D.getBytes();

barcode/src/test/java/org/xbib/graphics/barcode/output/SvgRendererTest.java

@@ -10,6 +10,8 @@ import org.xbib.graphics.barcode.Symbol;
 import org.xbib.graphics.barcode.render.GraphicsRenderer;
 import org.xbib.graphics.io.vector.svg.SVGGraphics2D;
 import java.awt.Color;
+import java.awt.Font;
+import java.awt.Rectangle;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
@@ -91,8 +93,11 @@ public class SvgRendererTest {
         symbol.setQuietZoneVertical(margin);
         int width = (int) (symbol.getWidth() * magnification);
         int height = (int) (symbol.getHeight() * magnification);
-        SVGGraphics2D svgGraphics2D = new SVGGraphics2D(0, 0, width, height);
+        Rectangle rectangle = new Rectangle(0, 0, width, height);
-        GraphicsRenderer graphicsRenderer = new GraphicsRenderer(svgGraphics2D, magnification, paper, ink, false, false);
+        SVGGraphics2D svgGraphics2D = new SVGGraphics2D(rectangle);
+        svgGraphics2D.setFont(new Font(Font.SANS_SERIF, Font.PLAIN, 12));
+        GraphicsRenderer graphicsRenderer = new GraphicsRenderer(svgGraphics2D,
+                rectangle, magnification, paper, ink, false, false);
         graphicsRenderer.render(symbol);
         graphicsRenderer.close();
         byte[] actualBytes = svgGraphics2D.getBytes();

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-basic.eps

@@ -16,7 +16,7 @@
 /imgdict { /datastream exch def /hasdata exch def /decodeScale exch def /bits exch def /bands exch def /imgheight exch def /imgwidth exch def << /ImageType 1 /Width imgwidth /Height imgheight /BitsPerComponent bits /Decode [bands {0 decodeScale} repeat] 
 /ImageMatrix [imgwidth 0 0 imgheight 0 0] hasdata { /DataSource datastream } if >> } bind def
 /latinize { /fontName exch def /fontNameNew exch def fontName findfont 0 dict copy begin /Encoding ISOLatin1Encoding def fontNameNew /FontName def currentdict end dup /FID undef fontNameNew exch definefont pop } bind def
-/LucidaGrandeLat /LucidaGrande latinize /LucidaGrandeLat 12.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 gsave
 clipsave
 /DeviceRGB setcolorspace
@@ -26,8 +26,9 @@ clipsave
 gsave
 0.0 0.0 0.0 rgb
 1.0 setlinewidth 0 setlinejoin 0 setlinecap [] 0.0 setdash
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 1.0 1.0 1.0 rgb
-newpath 0.0 0.0 1920.0 1200.0 rect Z fill
+newpath 0.0 0.0 128.0 60.0 rect Z fill
 0.0 0.0 0.0 rgb
 newpath 5.0 5.0 M 6.0 5.0 L 6.0 45.0 L 5.0 45.0 L Z fill
 newpath 7.0 5.0 M 8.0 5.0 L 8.0 45.0 L 7.0 45.0 L Z fill
@@ -69,8 +70,8 @@ newpath 113.0 5.0 M 114.0 5.0 L 114.0 45.0 L 113.0 45.0 L Z fill
 newpath 115.0 5.0 M 116.0 5.0 L 116.0 45.0 L 115.0 45.0 L Z fill
 newpath 117.0 5.0 M 121.0 5.0 L 121.0 45.0 L 117.0 45.0 L Z fill
 newpath 122.0 5.0 M 123.0 5.0 L 123.0 45.0 L 122.0 45.0 L Z fill
-/HelveticaLat /Helvetica latinize /HelveticaLat 8.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 8.0 selectfont
-gsave 1 -1 scale 41.0 -53.0 M (123456789Od) show grestore
+gsave 1 -1 scale 35.408203125 -53.0 M (123456789Od) show grestore
-/LucidaGrandeLat /LucidaGrande latinize /LucidaGrandeLat 12.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 grestore
 %%EOF

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-basic.pdf

@@ -0,0 +1,133 @@
+%PDF-1.4
+1 0 obj
+<<
+/Type /Catalog
+/Pages 2 0 R
+>>
+endobj
+2 0 obj
+<<
+/Type /Pages
+/Kids [3 0 R]
+/Count 1
+>>
+endobj
+3 0 obj
+<<
+/Type /Page
+/Parent 2 0 R
+/MediaBox [0 0 362.8346456692914 170.07874015748033]
+/Contents 4 0 R
+/Resources 6 0 R
+>>
+endobj
+4 0 obj
+<<
+/Length 5 0 R
+>>
+stream
+q
+1 1 1 rg 1 1 1 RG
+2.834645669291339 0 0 -2.834645669291339 0 170.07874015748033 cm
+/Fnt0 12.0 Tf
+q
+0 J
+
+/Fnt0 12.0 Tf
+0 0 m 128 0 l 128 60 l 0 60 l 0 0 l h f
+Q
+q
+0 0 0 rg 0 0 0 RG
+0 J
+
+/Fnt0 12.0 Tf
+5 5 m 6 5 l 6 45 l 5 45 l h f
+7 5 m 8 5 l 8 45 l 7 45 l h f
+9 5 m 13 5 l 13 45 l 9 45 l h f
+14 5 m 15 5 l 15 45 l 14 45 l h f
+16 5 m 17 5 l 17 45 l 16 45 l h f
+19 5 m 20 5 l 20 45 l 19 45 l h f
+23 5 m 24 5 l 24 45 l 23 45 l h f
+25 5 m 26 5 l 26 45 l 25 45 l h f
+29 5 m 30 5 l 30 45 l 29 45 l h f
+32 5 m 33 5 l 33 45 l 32 45 l h f
+34 5 m 35 5 l 35 45 l 34 45 l h f
+39 5 m 40 5 l 40 45 l 39 45 l h f
+41 5 m 42 5 l 42 45 l 41 45 l h f
+44 5 m 45 5 l 45 45 l 44 45 l h f
+46 5 m 47 5 l 47 45 l 46 45 l h f
+50 5 m 51 5 l 51 45 l 50 45 l h f
+53 5 m 54 5 l 54 45 l 53 45 l h f
+56 5 m 57 5 l 57 45 l 56 45 l h f
+59 5 m 60 5 l 60 45 l 59 45 l h f
+62 5 m 63 5 l 63 45 l 62 45 l h f
+66 5 m 67 5 l 67 45 l 66 45 l h f
+68 5 m 69 5 l 69 45 l 68 45 l h f
+70 5 m 71 5 l 71 45 l 70 45 l h f
+72 5 m 73 5 l 73 45 l 72 45 l h f
+77 5 m 78 5 l 78 45 l 77 45 l h f
+81 5 m 82 5 l 82 45 l 81 45 l h f
+84 5 m 85 5 l 85 45 l 84 45 l h f
+86 5 m 87 5 l 87 45 l 86 45 l h f
+91 5 m 92 5 l 92 45 l 91 45 l h f
+93 5 m 94 5 l 94 45 l 93 45 l h f
+95 5 m 96 5 l 96 45 l 95 45 l h f
+98 5 m 99 5 l 99 45 l 98 45 l h f
+100 5 m 102 5 l 102 45 l 100 45 l h f
+104 5 m 105 5 l 105 45 l 104 45 l h f
+107 5 m 109 5 l 109 45 l 107 45 l h f
+111 5 m 112 5 l 112 45 l 111 45 l h f
+113 5 m 114 5 l 114 45 l 113 45 l h f
+115 5 m 116 5 l 116 45 l 115 45 l h f
+117 5 m 121 5 l 121 45 l 117 45 l h f
+122 5 m 123 5 l 123 45 l 122 45 l h f
+Q
+q
+0 0 0 rg 0 0 0 RG
+0 J
+
+/Fnt1 8.0 Tf
+q 1 0 0 -1 35.408203125 53.0 cm BT (123456789Od) Tj ET Q
+Q
+Q
+endstream
+endobj
+5 0 obj
+1684
+endobj
+6 0 obj
+<<
+/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font <<
+/Fnt0 <<
+/Type /Font
+/Subtype /TrueType
+/Encoding /WinAnsiEncoding
+/BaseFont /DejaVuSans
+>>
+/Fnt1 <<
+/Type /Font
+/Subtype /TrueType
+/Encoding /WinAnsiEncoding
+/BaseFont /DejaVuSans
+>>
+>>
+>>
+endobj
+xref
+0 7
+0000000000 65535 f 
+0000000009 00000 n 
+0000000058 00000 n 
+0000000115 00000 n 
+0000000248 00000 n 
+0000001984 00000 n 
+0000002004 00000 n 
+trailer
+<<
+/Size 7
+/Root 1 0 R
+>>
+startxref
+2267
+%%EOF

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-basic.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" height="21.16666419722251mm" version="1.1" viewBox="0.0 0.0 128.0 60.0" width="45.15555028740802mm" x="0mm" y="0mm" xmlns="http://www.w3.org/2000/svg">
-  <rect height="1200" style="fill:rgb(255,255,255);stroke:none;" width="1920" x="0" y="0"/>
+  <rect height="60" style="fill:rgb(255,255,255);stroke:none;" width="128" x="0" y="0"/>
   <path d="M5.0,5.0 L6.0,5.0 L6.0,45.0 L5.0,45.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M7.0,5.0 L8.0,5.0 L8.0,45.0 L7.0,45.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M9.0,5.0 L13.0,5.0 L13.0,45.0 L9.0,45.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
@@ -42,5 +42,5 @@
   <path d="M115.0,5.0 L116.0,5.0 L116.0,45.0 L115.0,45.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M117.0,5.0 L121.0,5.0 L121.0,45.0 L117.0,45.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M122.0,5.0 L123.0,5.0 L123.0,45.0 L122.0,45.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
-  <text style="fill:rgb(0,0,0);stroke:none;font-family:&quot;Helvetica&quot;;font-size:8px;" x="41" y="53">123456789Od</text>
+  <text style="fill:rgb(0,0,0);stroke:none;font-family:&quot;DejaVu Sans&quot;;font-size:8px;" x="35.408203125" y="53">123456789Od</text>
 </svg>

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-colors.eps

@@ -16,7 +16,7 @@
 /imgdict { /datastream exch def /hasdata exch def /decodeScale exch def /bits exch def /bands exch def /imgheight exch def /imgwidth exch def << /ImageType 1 /Width imgwidth /Height imgheight /BitsPerComponent bits /Decode [bands {0 decodeScale} repeat] 
 /ImageMatrix [imgwidth 0 0 imgheight 0 0] hasdata { /DataSource datastream } if >> } bind def
 /latinize { /fontName exch def /fontNameNew exch def fontName findfont 0 dict copy begin /Encoding ISOLatin1Encoding def fontNameNew /FontName def currentdict end dup /FID undef fontNameNew exch definefont pop } bind def
-/LucidaGrandeLat /LucidaGrande latinize /LucidaGrandeLat 12.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 gsave
 clipsave
 /DeviceRGB setcolorspace
@@ -26,8 +26,9 @@ clipsave
 gsave
 0.0 0.0 0.0 rgb
 1.0 setlinewidth 0 setlinejoin 0 setlinecap [] 0.0 setdash
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 0.0 1.0 0.0 rgb
-newpath 0.0 0.0 1920.0 1200.0 rect Z fill
+newpath 0.0 0.0 128.0 60.0 rect Z fill
 1.0 0.0 0.0 rgb
 newpath 5.0 5.0 M 6.0 5.0 L 6.0 45.0 L 5.0 45.0 L Z fill
 newpath 7.0 5.0 M 8.0 5.0 L 8.0 45.0 L 7.0 45.0 L Z fill
@@ -69,9 +70,9 @@ newpath 113.0 5.0 M 114.0 5.0 L 114.0 45.0 L 113.0 45.0 L Z fill
 newpath 115.0 5.0 M 116.0 5.0 L 116.0 45.0 L 115.0 45.0 L Z fill
 newpath 117.0 5.0 M 121.0 5.0 L 121.0 45.0 L 117.0 45.0 L Z fill
 newpath 122.0 5.0 M 123.0 5.0 L 123.0 45.0 L 122.0 45.0 L Z fill
-/HelveticaLat /Helvetica latinize /HelveticaLat 8.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 8.0 selectfont
-gsave 1 -1 scale 41.0 -53.0 M (123456789Od) show grestore
+gsave 1 -1 scale 35.408203125 -53.0 M (123456789Od) show grestore
-/LucidaGrandeLat /LucidaGrande latinize /LucidaGrandeLat 12.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 0.0 0.0 0.0 rgb
 grestore
 %%EOF

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-colors.pdf

@@ -0,0 +1,134 @@
+%PDF-1.4
+1 0 obj
+<<
+/Type /Catalog
+/Pages 2 0 R
+>>
+endobj
+2 0 obj
+<<
+/Type /Pages
+/Kids [3 0 R]
+/Count 1
+>>
+endobj
+3 0 obj
+<<
+/Type /Page
+/Parent 2 0 R
+/MediaBox [0 0 362.8346456692914 170.07874015748033]
+/Contents 4 0 R
+/Resources 6 0 R
+>>
+endobj
+4 0 obj
+<<
+/Length 5 0 R
+>>
+stream
+q
+1 1 1 rg 1 1 1 RG
+2.834645669291339 0 0 -2.834645669291339 0 170.07874015748033 cm
+/Fnt0 12.0 Tf
+q
+0 1 0 rg 0 1 0 RG
+0 J
+
+/Fnt0 12.0 Tf
+0 0 m 128 0 l 128 60 l 0 60 l 0 0 l h f
+Q
+q
+1 0 0 rg 1 0 0 RG
+0 J
+
+/Fnt0 12.0 Tf
+5 5 m 6 5 l 6 45 l 5 45 l h f
+7 5 m 8 5 l 8 45 l 7 45 l h f
+9 5 m 13 5 l 13 45 l 9 45 l h f
+14 5 m 15 5 l 15 45 l 14 45 l h f
+16 5 m 17 5 l 17 45 l 16 45 l h f
+19 5 m 20 5 l 20 45 l 19 45 l h f
+23 5 m 24 5 l 24 45 l 23 45 l h f
+25 5 m 26 5 l 26 45 l 25 45 l h f
+29 5 m 30 5 l 30 45 l 29 45 l h f
+32 5 m 33 5 l 33 45 l 32 45 l h f
+34 5 m 35 5 l 35 45 l 34 45 l h f
+39 5 m 40 5 l 40 45 l 39 45 l h f
+41 5 m 42 5 l 42 45 l 41 45 l h f
+44 5 m 45 5 l 45 45 l 44 45 l h f
+46 5 m 47 5 l 47 45 l 46 45 l h f
+50 5 m 51 5 l 51 45 l 50 45 l h f
+53 5 m 54 5 l 54 45 l 53 45 l h f
+56 5 m 57 5 l 57 45 l 56 45 l h f
+59 5 m 60 5 l 60 45 l 59 45 l h f
+62 5 m 63 5 l 63 45 l 62 45 l h f
+66 5 m 67 5 l 67 45 l 66 45 l h f
+68 5 m 69 5 l 69 45 l 68 45 l h f
+70 5 m 71 5 l 71 45 l 70 45 l h f
+72 5 m 73 5 l 73 45 l 72 45 l h f
+77 5 m 78 5 l 78 45 l 77 45 l h f
+81 5 m 82 5 l 82 45 l 81 45 l h f
+84 5 m 85 5 l 85 45 l 84 45 l h f
+86 5 m 87 5 l 87 45 l 86 45 l h f
+91 5 m 92 5 l 92 45 l 91 45 l h f
+93 5 m 94 5 l 94 45 l 93 45 l h f
+95 5 m 96 5 l 96 45 l 95 45 l h f
+98 5 m 99 5 l 99 45 l 98 45 l h f
+100 5 m 102 5 l 102 45 l 100 45 l h f
+104 5 m 105 5 l 105 45 l 104 45 l h f
+107 5 m 109 5 l 109 45 l 107 45 l h f
+111 5 m 112 5 l 112 45 l 111 45 l h f
+113 5 m 114 5 l 114 45 l 113 45 l h f
+115 5 m 116 5 l 116 45 l 115 45 l h f
+117 5 m 121 5 l 121 45 l 117 45 l h f
+122 5 m 123 5 l 123 45 l 122 45 l h f
+Q
+q
+1 0 0 rg 1 0 0 RG
+0 J
+
+/Fnt1 8.0 Tf
+q 1 0 0 -1 35.408203125 53.0 cm BT (123456789Od) Tj ET Q
+Q
+Q
+endstream
+endobj
+5 0 obj
+1702
+endobj
+6 0 obj
+<<
+/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font <<
+/Fnt0 <<
+/Type /Font
+/Subtype /TrueType
+/Encoding /WinAnsiEncoding
+/BaseFont /DejaVuSans
+>>
+/Fnt1 <<
+/Type /Font
+/Subtype /TrueType
+/Encoding /WinAnsiEncoding
+/BaseFont /DejaVuSans
+>>
+>>
+>>
+endobj
+xref
+0 7
+0000000000 65535 f 
+0000000009 00000 n 
+0000000058 00000 n 
+0000000115 00000 n 
+0000000248 00000 n 
+0000002002 00000 n 
+0000002022 00000 n 
+trailer
+<<
+/Size 7
+/Root 1 0 R
+>>
+startxref
+2285
+%%EOF

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-colors.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" height="21.16666419722251mm" version="1.1" viewBox="0.0 0.0 128.0 60.0" width="45.15555028740802mm" x="0mm" y="0mm" xmlns="http://www.w3.org/2000/svg">
-  <rect height="1200" style="fill:rgb(0,255,0);stroke:none;" width="1920" x="0" y="0"/>
+  <rect height="60" style="fill:rgb(0,255,0);stroke:none;" width="128" x="0" y="0"/>
   <path d="M5.0,5.0 L6.0,5.0 L6.0,45.0 L5.0,45.0 Z" style="fill:rgb(255,0,0);stroke:none;"/>
   <path d="M7.0,5.0 L8.0,5.0 L8.0,45.0 L7.0,45.0 Z" style="fill:rgb(255,0,0);stroke:none;"/>
   <path d="M9.0,5.0 L13.0,5.0 L13.0,45.0 L9.0,45.0 Z" style="fill:rgb(255,0,0);stroke:none;"/>
@@ -42,5 +42,5 @@
   <path d="M115.0,5.0 L116.0,5.0 L116.0,45.0 L115.0,45.0 Z" style="fill:rgb(255,0,0);stroke:none;"/>
   <path d="M117.0,5.0 L121.0,5.0 L121.0,45.0 L117.0,45.0 Z" style="fill:rgb(255,0,0);stroke:none;"/>
   <path d="M122.0,5.0 L123.0,5.0 L123.0,45.0 L122.0,45.0 Z" style="fill:rgb(255,0,0);stroke:none;"/>
-  <text style="fill:rgb(255,0,0);stroke:none;font-family:&quot;Helvetica&quot;;font-size:8px;" x="41" y="53">123456789Od</text>
+  <text style="fill:rgb(255,0,0);stroke:none;font-family:&quot;DejaVu Sans&quot;;font-size:8px;" x="35.408203125" y="53">123456789Od</text>
 </svg>

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-custom-font.eps

@@ -16,7 +16,7 @@
 /imgdict { /datastream exch def /hasdata exch def /decodeScale exch def /bits exch def /bands exch def /imgheight exch def /imgwidth exch def << /ImageType 1 /Width imgwidth /Height imgheight /BitsPerComponent bits /Decode [bands {0 decodeScale} repeat] 
 /ImageMatrix [imgwidth 0 0 imgheight 0 0] hasdata { /DataSource datastream } if >> } bind def
 /latinize { /fontName exch def /fontNameNew exch def fontName findfont 0 dict copy begin /Encoding ISOLatin1Encoding def fontNameNew /FontName def currentdict end dup /FID undef fontNameNew exch definefont pop } bind def
-/LucidaGrandeLat /LucidaGrande latinize /LucidaGrandeLat 12.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 gsave
 clipsave
 /DeviceRGB setcolorspace
@@ -26,8 +26,9 @@ clipsave
 gsave
 0.0 0.0 0.0 rgb
 1.0 setlinewidth 0 setlinejoin 0 setlinecap [] 0.0 setdash
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 1.0 1.0 1.0 rgb
-newpath 0.0 0.0 1920.0 1200.0 rect Z fill
+newpath 0.0 0.0 128.0 82.0 rect Z fill
 0.0 0.0 0.0 rgb
 newpath 5.0 5.0 M 6.0 5.0 L 6.0 45.0 L 5.0 45.0 L Z fill
 newpath 7.0 5.0 M 8.0 5.0 L 8.0 45.0 L 7.0 45.0 L Z fill
@@ -69,8 +70,8 @@ newpath 113.0 5.0 M 114.0 5.0 L 114.0 45.0 L 113.0 45.0 L Z fill
 newpath 115.0 5.0 M 116.0 5.0 L 116.0 45.0 L 115.0 45.0 L Z fill
 newpath 117.0 5.0 M 121.0 5.0 L 121.0 45.0 L 117.0 45.0 L Z fill
 newpath 122.0 5.0 M 123.0 5.0 L 123.0 45.0 L 122.0 45.0 L Z fill
-/ArialMTLat /ArialMT latinize /ArialMTLat 26.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 26.0 selectfont
-gsave 1 -1 scale -16.0 -71.0 M (123456789Od) show grestore
+gsave 1 -1 scale -28.92333984375 -71.0 M (123456789Od) show grestore
-/LucidaGrandeLat /LucidaGrande latinize /LucidaGrandeLat 12.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 grestore
 %%EOF

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-custom-font.pdf

@@ -0,0 +1,133 @@
+%PDF-1.4
+1 0 obj
+<<
+/Type /Catalog
+/Pages 2 0 R
+>>
+endobj
+2 0 obj
+<<
+/Type /Pages
+/Kids [3 0 R]
+/Count 1
+>>
+endobj
+3 0 obj
+<<
+/Type /Page
+/Parent 2 0 R
+/MediaBox [0 0 362.8346456692914 232.44094488188978]
+/Contents 4 0 R
+/Resources 6 0 R
+>>
+endobj
+4 0 obj
+<<
+/Length 5 0 R
+>>
+stream
+q
+1 1 1 rg 1 1 1 RG
+2.834645669291339 0 0 -2.834645669291339 0 232.44094488188978 cm
+/Fnt0 12.0 Tf
+q
+0 J
+
+/Fnt0 12.0 Tf
+0 0 m 128 0 l 128 82 l 0 82 l 0 0 l h f
+Q
+q
+0 0 0 rg 0 0 0 RG
+0 J
+
+/Fnt0 12.0 Tf
+5 5 m 6 5 l 6 45 l 5 45 l h f
+7 5 m 8 5 l 8 45 l 7 45 l h f
+9 5 m 13 5 l 13 45 l 9 45 l h f
+14 5 m 15 5 l 15 45 l 14 45 l h f
+16 5 m 17 5 l 17 45 l 16 45 l h f
+19 5 m 20 5 l 20 45 l 19 45 l h f
+23 5 m 24 5 l 24 45 l 23 45 l h f
+25 5 m 26 5 l 26 45 l 25 45 l h f
+29 5 m 30 5 l 30 45 l 29 45 l h f
+32 5 m 33 5 l 33 45 l 32 45 l h f
+34 5 m 35 5 l 35 45 l 34 45 l h f
+39 5 m 40 5 l 40 45 l 39 45 l h f
+41 5 m 42 5 l 42 45 l 41 45 l h f
+44 5 m 45 5 l 45 45 l 44 45 l h f
+46 5 m 47 5 l 47 45 l 46 45 l h f
+50 5 m 51 5 l 51 45 l 50 45 l h f
+53 5 m 54 5 l 54 45 l 53 45 l h f
+56 5 m 57 5 l 57 45 l 56 45 l h f
+59 5 m 60 5 l 60 45 l 59 45 l h f
+62 5 m 63 5 l 63 45 l 62 45 l h f
+66 5 m 67 5 l 67 45 l 66 45 l h f
+68 5 m 69 5 l 69 45 l 68 45 l h f
+70 5 m 71 5 l 71 45 l 70 45 l h f
+72 5 m 73 5 l 73 45 l 72 45 l h f
+77 5 m 78 5 l 78 45 l 77 45 l h f
+81 5 m 82 5 l 82 45 l 81 45 l h f
+84 5 m 85 5 l 85 45 l 84 45 l h f
+86 5 m 87 5 l 87 45 l 86 45 l h f
+91 5 m 92 5 l 92 45 l 91 45 l h f
+93 5 m 94 5 l 94 45 l 93 45 l h f
+95 5 m 96 5 l 96 45 l 95 45 l h f
+98 5 m 99 5 l 99 45 l 98 45 l h f
+100 5 m 102 5 l 102 45 l 100 45 l h f
+104 5 m 105 5 l 105 45 l 104 45 l h f
+107 5 m 109 5 l 109 45 l 107 45 l h f
+111 5 m 112 5 l 112 45 l 111 45 l h f
+113 5 m 114 5 l 114 45 l 113 45 l h f
+115 5 m 116 5 l 116 45 l 115 45 l h f
+117 5 m 121 5 l 121 45 l 117 45 l h f
+122 5 m 123 5 l 123 45 l 122 45 l h f
+Q
+q
+0 0 0 rg 0 0 0 RG
+0 J
+
+/Fnt1 26.0 Tf
+q 1 0 0 -1 -28.92333984375 71.0 cm BT (123456789Od) Tj ET Q
+Q
+Q
+endstream
+endobj
+5 0 obj
+1688
+endobj
+6 0 obj
+<<
+/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font <<
+/Fnt0 <<
+/Type /Font
+/Subtype /TrueType
+/Encoding /WinAnsiEncoding
+/BaseFont /DejaVuSans
+>>
+/Fnt1 <<
+/Type /Font
+/Subtype /TrueType
+/Encoding /WinAnsiEncoding
+/BaseFont /DejaVuSans
+>>
+>>
+>>
+endobj
+xref
+0 7
+0000000000 65535 f 
+0000000009 00000 n 
+0000000058 00000 n 
+0000000115 00000 n 
+0000000248 00000 n 
+0000001988 00000 n 
+0000002008 00000 n 
+trailer
+<<
+/Size 7
+/Root 1 0 R
+>>
+startxref
+2271
+%%EOF

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-custom-font.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" height="28.92777440287076mm" version="1.1" viewBox="0.0 0.0 128.0 82.0" width="45.15555028740802mm" x="0mm" y="0mm" xmlns="http://www.w3.org/2000/svg">
-  <rect height="1200" style="fill:rgb(255,255,255);stroke:none;" width="1920" x="0" y="0"/>
+  <rect height="82" style="fill:rgb(255,255,255);stroke:none;" width="128" x="0" y="0"/>
   <path d="M5.0,5.0 L6.0,5.0 L6.0,45.0 L5.0,45.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M7.0,5.0 L8.0,5.0 L8.0,45.0 L7.0,45.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M9.0,5.0 L13.0,5.0 L13.0,45.0 L9.0,45.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
@@ -42,5 +42,5 @@
   <path d="M115.0,5.0 L116.0,5.0 L116.0,45.0 L115.0,45.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M117.0,5.0 L121.0,5.0 L121.0,45.0 L117.0,45.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M122.0,5.0 L123.0,5.0 L123.0,45.0 L122.0,45.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
-  <text style="fill:rgb(0,0,0);stroke:none;font-family:&quot;Arial&quot;;font-size:26px;" x="-16" y="71">123456789Od</text>
+  <text style="fill:rgb(0,0,0);stroke:none;font-size:26px;" x="-28.92333984375" y="71">123456789Od</text>
 </svg>

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-magnification-2.eps

@@ -16,7 +16,7 @@
 /imgdict { /datastream exch def /hasdata exch def /decodeScale exch def /bits exch def /bands exch def /imgheight exch def /imgwidth exch def << /ImageType 1 /Width imgwidth /Height imgheight /BitsPerComponent bits /Decode [bands {0 decodeScale} repeat] 
 /ImageMatrix [imgwidth 0 0 imgheight 0 0] hasdata { /DataSource datastream } if >> } bind def
 /latinize { /fontName exch def /fontNameNew exch def fontName findfont 0 dict copy begin /Encoding ISOLatin1Encoding def fontNameNew /FontName def currentdict end dup /FID undef fontNameNew exch definefont pop } bind def
-/LucidaGrandeLat /LucidaGrande latinize /LucidaGrandeLat 12.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 gsave
 clipsave
 /DeviceRGB setcolorspace
@@ -26,8 +26,9 @@ clipsave
 gsave
 0.0 0.0 0.0 rgb
 1.0 setlinewidth 0 setlinejoin 0 setlinecap [] 0.0 setdash
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 1.0 1.0 1.0 rgb
-newpath 0.0 0.0 1920.0 1200.0 rect Z fill
+newpath 0.0 0.0 256.0 120.0 rect Z fill
 0.0 0.0 0.0 rgb
 newpath 10.0 10.0 M 12.0 10.0 L 12.0 90.0 L 10.0 90.0 L Z fill
 newpath 14.0 10.0 M 16.0 10.0 L 16.0 90.0 L 14.0 90.0 L Z fill
@@ -69,8 +70,8 @@ newpath 226.0 10.0 M 228.0 10.0 L 228.0 90.0 L 226.0 90.0 L Z fill
 newpath 230.0 10.0 M 232.0 10.0 L 232.0 90.0 L 230.0 90.0 L Z fill
 newpath 234.0 10.0 M 242.0 10.0 L 242.0 90.0 L 234.0 90.0 L Z fill
 newpath 244.0 10.0 M 246.0 10.0 L 246.0 90.0 L 244.0 90.0 L Z fill
-/HelveticaLat /Helvetica latinize /HelveticaLat 16.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 16.0 selectfont
-gsave 1 -1 scale 77.0 -106.0 M (123456789Od) show grestore
+gsave 1 -1 scale 70.81640625 -106.0 M (123456789Od) show grestore
-/LucidaGrandeLat /LucidaGrande latinize /LucidaGrandeLat 12.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 grestore
 %%EOF

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-magnification-2.pdf

@@ -0,0 +1,133 @@
+%PDF-1.4
+1 0 obj
+<<
+/Type /Catalog
+/Pages 2 0 R
+>>
+endobj
+2 0 obj
+<<
+/Type /Pages
+/Kids [3 0 R]
+/Count 1
+>>
+endobj
+3 0 obj
+<<
+/Type /Page
+/Parent 2 0 R
+/MediaBox [0 0 725.6692913385828 340.15748031496065]
+/Contents 4 0 R
+/Resources 6 0 R
+>>
+endobj
+4 0 obj
+<<
+/Length 5 0 R
+>>
+stream
+q
+1 1 1 rg 1 1 1 RG
+2.834645669291339 0 0 -2.834645669291339 0 340.15748031496065 cm
+/Fnt0 12.0 Tf
+q
+0 J
+
+/Fnt0 12.0 Tf
+0 0 m 256 0 l 256 120 l 0 120 l 0 0 l h f
+Q
+q
+0 0 0 rg 0 0 0 RG
+0 J
+
+/Fnt0 12.0 Tf
+10 10 m 12 10 l 12 90 l 10 90 l h f
+14 10 m 16 10 l 16 90 l 14 90 l h f
+18 10 m 26 10 l 26 90 l 18 90 l h f
+28 10 m 30 10 l 30 90 l 28 90 l h f
+32 10 m 34 10 l 34 90 l 32 90 l h f
+38 10 m 40 10 l 40 90 l 38 90 l h f
+46 10 m 48 10 l 48 90 l 46 90 l h f
+50 10 m 52 10 l 52 90 l 50 90 l h f
+58 10 m 60 10 l 60 90 l 58 90 l h f
+64 10 m 66 10 l 66 90 l 64 90 l h f
+68 10 m 70 10 l 70 90 l 68 90 l h f
+78 10 m 80 10 l 80 90 l 78 90 l h f
+82 10 m 84 10 l 84 90 l 82 90 l h f
+88 10 m 90 10 l 90 90 l 88 90 l h f
+92 10 m 94 10 l 94 90 l 92 90 l h f
+100 10 m 102 10 l 102 90 l 100 90 l h f
+106 10 m 108 10 l 108 90 l 106 90 l h f
+112 10 m 114 10 l 114 90 l 112 90 l h f
+118 10 m 120 10 l 120 90 l 118 90 l h f
+124 10 m 126 10 l 126 90 l 124 90 l h f
+132 10 m 134 10 l 134 90 l 132 90 l h f
+136 10 m 138 10 l 138 90 l 136 90 l h f
+140 10 m 142 10 l 142 90 l 140 90 l h f
+144 10 m 146 10 l 146 90 l 144 90 l h f
+154 10 m 156 10 l 156 90 l 154 90 l h f
+162 10 m 164 10 l 164 90 l 162 90 l h f
+168 10 m 170 10 l 170 90 l 168 90 l h f
+172 10 m 174 10 l 174 90 l 172 90 l h f
+182 10 m 184 10 l 184 90 l 182 90 l h f
+186 10 m 188 10 l 188 90 l 186 90 l h f
+190 10 m 192 10 l 192 90 l 190 90 l h f
+196 10 m 198 10 l 198 90 l 196 90 l h f
+200 10 m 204 10 l 204 90 l 200 90 l h f
+208 10 m 210 10 l 210 90 l 208 90 l h f
+214 10 m 218 10 l 218 90 l 214 90 l h f
+222 10 m 224 10 l 224 90 l 222 90 l h f
+226 10 m 228 10 l 228 90 l 226 90 l h f
+230 10 m 232 10 l 232 90 l 230 90 l h f
+234 10 m 242 10 l 242 90 l 234 90 l h f
+244 10 m 246 10 l 246 90 l 244 90 l h f
+Q
+q
+0 0 0 rg 0 0 0 RG
+0 J
+
+/Fnt1 16.0 Tf
+q 1 0 0 -1 70.81640625 106.0 cm BT (123456789Od) Tj ET Q
+Q
+Q
+endstream
+endobj
+5 0 obj
+1845
+endobj
+6 0 obj
+<<
+/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font <<
+/Fnt0 <<
+/Type /Font
+/Subtype /TrueType
+/Encoding /WinAnsiEncoding
+/BaseFont /DejaVuSans
+>>
+/Fnt1 <<
+/Type /Font
+/Subtype /TrueType
+/Encoding /WinAnsiEncoding
+/BaseFont /DejaVuSans
+>>
+>>
+>>
+endobj
+xref
+0 7
+0000000000 65535 f 
+0000000009 00000 n 
+0000000058 00000 n 
+0000000115 00000 n 
+0000000248 00000 n 
+0000002145 00000 n 
+0000002165 00000 n 
+trailer
+<<
+/Size 7
+/Root 1 0 R
+>>
+startxref
+2428
+%%EOF

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-magnification-2.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" height="42.33332839444502mm" version="1.1" viewBox="0.0 0.0 256.0 120.0" width="90.31110057481604mm" x="0mm" y="0mm" xmlns="http://www.w3.org/2000/svg">
-  <rect height="1200" style="fill:rgb(255,255,255);stroke:none;" width="1920" x="0" y="0"/>
+  <rect height="120" style="fill:rgb(255,255,255);stroke:none;" width="256" x="0" y="0"/>
   <path d="M10.0,10.0 L12.0,10.0 L12.0,90.0 L10.0,90.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M14.0,10.0 L16.0,10.0 L16.0,90.0 L14.0,90.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M18.0,10.0 L26.0,10.0 L26.0,90.0 L18.0,90.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
@@ -42,5 +42,5 @@
   <path d="M230.0,10.0 L232.0,10.0 L232.0,90.0 L230.0,90.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M234.0,10.0 L242.0,10.0 L242.0,90.0 L234.0,90.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M244.0,10.0 L246.0,10.0 L246.0,90.0 L244.0,90.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
-  <text style="fill:rgb(0,0,0);stroke:none;font-family:&quot;Helvetica&quot;;font-size:16px;" x="77" y="106">123456789Od</text>
+  <text style="fill:rgb(0,0,0);stroke:none;font-family:&quot;DejaVu Sans&quot;;font-size:16px;" x="70.81640625" y="106">123456789Od</text>
 </svg>

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-margin-size-20.eps

@@ -16,7 +16,7 @@
 /imgdict { /datastream exch def /hasdata exch def /decodeScale exch def /bits exch def /bands exch def /imgheight exch def /imgwidth exch def << /ImageType 1 /Width imgwidth /Height imgheight /BitsPerComponent bits /Decode [bands {0 decodeScale} repeat] 
 /ImageMatrix [imgwidth 0 0 imgheight 0 0] hasdata { /DataSource datastream } if >> } bind def
 /latinize { /fontName exch def /fontNameNew exch def fontName findfont 0 dict copy begin /Encoding ISOLatin1Encoding def fontNameNew /FontName def currentdict end dup /FID undef fontNameNew exch definefont pop } bind def
-/LucidaGrandeLat /LucidaGrande latinize /LucidaGrandeLat 12.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 gsave
 clipsave
 /DeviceRGB setcolorspace
@@ -26,8 +26,9 @@ clipsave
 gsave
 0.0 0.0 0.0 rgb
 1.0 setlinewidth 0 setlinejoin 0 setlinecap [] 0.0 setdash
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 1.0 1.0 1.0 rgb
-newpath 0.0 0.0 1920.0 1200.0 rect Z fill
+newpath 0.0 0.0 158.0 90.0 rect Z fill
 0.0 0.0 0.0 rgb
 newpath 20.0 20.0 M 21.0 20.0 L 21.0 60.0 L 20.0 60.0 L Z fill
 newpath 22.0 20.0 M 23.0 20.0 L 23.0 60.0 L 22.0 60.0 L Z fill
@@ -69,8 +70,8 @@ newpath 128.0 20.0 M 129.0 20.0 L 129.0 60.0 L 128.0 60.0 L Z fill
 newpath 130.0 20.0 M 131.0 20.0 L 131.0 60.0 L 130.0 60.0 L Z fill
 newpath 132.0 20.0 M 136.0 20.0 L 136.0 60.0 L 132.0 60.0 L Z fill
 newpath 137.0 20.0 M 138.0 20.0 L 138.0 60.0 L 137.0 60.0 L Z fill
-/HelveticaLat /Helvetica latinize /HelveticaLat 8.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 8.0 selectfont
-gsave 1 -1 scale 56.0 -68.0 M (123456789Od) show grestore
+gsave 1 -1 scale 50.408203125 -68.0 M (123456789Od) show grestore
-/LucidaGrandeLat /LucidaGrande latinize /LucidaGrandeLat 12.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 grestore
 %%EOF

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-margin-size-20.pdf

@@ -0,0 +1,133 @@
+%PDF-1.4
+1 0 obj
+<<
+/Type /Catalog
+/Pages 2 0 R
+>>
+endobj
+2 0 obj
+<<
+/Type /Pages
+/Kids [3 0 R]
+/Count 1
+>>
+endobj
+3 0 obj
+<<
+/Type /Page
+/Parent 2 0 R
+/MediaBox [0 0 447.8740157480315 255.1181102362205]
+/Contents 4 0 R
+/Resources 6 0 R
+>>
+endobj
+4 0 obj
+<<
+/Length 5 0 R
+>>
+stream
+q
+1 1 1 rg 1 1 1 RG
+2.834645669291339 0 0 -2.834645669291339 0 255.1181102362205 cm
+/Fnt0 12.0 Tf
+q
+0 J
+
+/Fnt0 12.0 Tf
+0 0 m 158 0 l 158 90 l 0 90 l 0 0 l h f
+Q
+q
+0 0 0 rg 0 0 0 RG
+0 J
+
+/Fnt0 12.0 Tf
+20 20 m 21 20 l 21 60 l 20 60 l h f
+22 20 m 23 20 l 23 60 l 22 60 l h f
+24 20 m 28 20 l 28 60 l 24 60 l h f
+29 20 m 30 20 l 30 60 l 29 60 l h f
+31 20 m 32 20 l 32 60 l 31 60 l h f
+34 20 m 35 20 l 35 60 l 34 60 l h f
+38 20 m 39 20 l 39 60 l 38 60 l h f
+40 20 m 41 20 l 41 60 l 40 60 l h f
+44 20 m 45 20 l 45 60 l 44 60 l h f
+47 20 m 48 20 l 48 60 l 47 60 l h f
+49 20 m 50 20 l 50 60 l 49 60 l h f
+54 20 m 55 20 l 55 60 l 54 60 l h f
+56 20 m 57 20 l 57 60 l 56 60 l h f
+59 20 m 60 20 l 60 60 l 59 60 l h f
+61 20 m 62 20 l 62 60 l 61 60 l h f
+65 20 m 66 20 l 66 60 l 65 60 l h f
+68 20 m 69 20 l 69 60 l 68 60 l h f
+71 20 m 72 20 l 72 60 l 71 60 l h f
+74 20 m 75 20 l 75 60 l 74 60 l h f
+77 20 m 78 20 l 78 60 l 77 60 l h f
+81 20 m 82 20 l 82 60 l 81 60 l h f
+83 20 m 84 20 l 84 60 l 83 60 l h f
+85 20 m 86 20 l 86 60 l 85 60 l h f
+87 20 m 88 20 l 88 60 l 87 60 l h f
+92 20 m 93 20 l 93 60 l 92 60 l h f
+96 20 m 97 20 l 97 60 l 96 60 l h f
+99 20 m 100 20 l 100 60 l 99 60 l h f
+101 20 m 102 20 l 102 60 l 101 60 l h f
+106 20 m 107 20 l 107 60 l 106 60 l h f
+108 20 m 109 20 l 109 60 l 108 60 l h f
+110 20 m 111 20 l 111 60 l 110 60 l h f
+113 20 m 114 20 l 114 60 l 113 60 l h f
+115 20 m 117 20 l 117 60 l 115 60 l h f
+119 20 m 120 20 l 120 60 l 119 60 l h f
+122 20 m 124 20 l 124 60 l 122 60 l h f
+126 20 m 127 20 l 127 60 l 126 60 l h f
+128 20 m 129 20 l 129 60 l 128 60 l h f
+130 20 m 131 20 l 131 60 l 130 60 l h f
+132 20 m 136 20 l 136 60 l 132 60 l h f
+137 20 m 138 20 l 138 60 l 137 60 l h f
+Q
+q
+0 0 0 rg 0 0 0 RG
+0 J
+
+/Fnt1 8.0 Tf
+q 1 0 0 -1 50.408203125 68.0 cm BT (123456789Od) Tj ET Q
+Q
+Q
+endstream
+endobj
+5 0 obj
+1795
+endobj
+6 0 obj
+<<
+/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font <<
+/Fnt0 <<
+/Type /Font
+/Subtype /TrueType
+/Encoding /WinAnsiEncoding
+/BaseFont /DejaVuSans
+>>
+/Fnt1 <<
+/Type /Font
+/Subtype /TrueType
+/Encoding /WinAnsiEncoding
+/BaseFont /DejaVuSans
+>>
+>>
+>>
+endobj
+xref
+0 7
+0000000000 65535 f 
+0000000009 00000 n 
+0000000058 00000 n 
+0000000115 00000 n 
+0000000247 00000 n 
+0000002094 00000 n 
+0000002114 00000 n 
+trailer
+<<
+/Size 7
+/Root 1 0 R
+>>
+startxref
+2377
+%%EOF

barcode/src/test/resources/org/xbib/graphics/barcode/output/code93-margin-size-20.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" height="31.749996295833764mm" version="1.1" viewBox="0.0 0.0 158.0 90.0" width="55.73888238601927mm" x="0mm" y="0mm" xmlns="http://www.w3.org/2000/svg">
-  <rect height="1200" style="fill:rgb(255,255,255);stroke:none;" width="1920" x="0" y="0"/>
+  <rect height="90" style="fill:rgb(255,255,255);stroke:none;" width="158" x="0" y="0"/>
   <path d="M20.0,20.0 L21.0,20.0 L21.0,60.0 L20.0,60.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M22.0,20.0 L23.0,20.0 L23.0,60.0 L22.0,60.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M24.0,20.0 L28.0,20.0 L28.0,60.0 L24.0,60.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
@@ -42,5 +42,5 @@
   <path d="M130.0,20.0 L131.0,20.0 L131.0,60.0 L130.0,60.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M132.0,20.0 L136.0,20.0 L136.0,60.0 L132.0,60.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M137.0,20.0 L138.0,20.0 L138.0,60.0 L137.0,60.0 Z" style="fill:rgb(0,0,0);stroke:none;"/>
-  <text style="fill:rgb(0,0,0);stroke:none;font-family:&quot;Helvetica&quot;;font-size:8px;" x="56" y="68">123456789Od</text>
+  <text style="fill:rgb(0,0,0);stroke:none;font-family:&quot;DejaVu Sans&quot;;font-size:8px;" x="50.408203125" y="68">123456789Od</text>
 </svg>

barcode/src/test/resources/org/xbib/graphics/barcode/output/maxicode-basic.eps

@@ -16,7 +16,7 @@
 /imgdict { /datastream exch def /hasdata exch def /decodeScale exch def /bits exch def /bands exch def /imgheight exch def /imgwidth exch def << /ImageType 1 /Width imgwidth /Height imgheight /BitsPerComponent bits /Decode [bands {0 decodeScale} repeat] 
 /ImageMatrix [imgwidth 0 0 imgheight 0 0] hasdata { /DataSource datastream } if >> } bind def
 /latinize { /fontName exch def /fontNameNew exch def fontName findfont 0 dict copy begin /Encoding ISOLatin1Encoding def fontNameNew /FontName def currentdict end dup /FID undef fontNameNew exch definefont pop } bind def
-/LucidaGrandeLat /LucidaGrande latinize /LucidaGrandeLat 12.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 gsave
 clipsave
 /DeviceRGB setcolorspace
@@ -26,11 +26,12 @@ clipsave
 gsave
 0.0 0.0 0.0 rgb
 1.0 setlinewidth 0 setlinejoin 0 setlinecap [] 0.0 setdash
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 1.0 1.0 1.0 rgb
-newpath 0.0 0.0 1920.0 1200.0 rect Z fill
+newpath 0.0 0.0 420.0 410.0 rect Z fill
 0.0 0.0 0.0 rgb
-/HelveticaLat /Helvetica latinize /HelveticaLat 40.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 40.0 selectfont
-/LucidaGrandeLat /LucidaGrande latinize /LucidaGrandeLat 12.0 selectfont
+/DejaVuSansLat /DejaVuSans latinize /DejaVuSansLat 12.0 selectfont
 newpath 43.45 38.4 M 48.825 35.275 L 48.825 29.025 L 43.45 25.9 L 38.075 29.025 L 38.075 35.275 L Z fill
 newpath 68.05 38.4 M 73.425 35.275 L 73.425 29.025 L 68.05 25.9 L 62.675 29.025 L 62.675 35.275 L Z fill
 newpath 92.65 38.4 M 98.025 35.275 L 98.025 29.025 L 92.65 25.9 L 87.275 29.025 L 87.275 35.275 L Z fill

barcode/src/test/resources/org/xbib/graphics/barcode/output/maxicode-basic.pdf

@@ -0,0 +1,482 @@
+%PDF-1.4
+1 0 obj
+<<
+/Type /Catalog
+/Pages 2 0 R
+>>
+endobj
+2 0 obj
+<<
+/Type /Pages
+/Kids [3 0 R]
+/Count 1
+>>
+endobj
+3 0 obj
+<<
+/Type /Page
+/Parent 2 0 R
+/MediaBox [0 0 1190.5511811023623 1162.204724409449]
+/Contents 4 0 R
+/Resources 6 0 R
+>>
+endobj
+4 0 obj
+<<
+/Length 5 0 R
+>>
+stream
+q
+1 1 1 rg 1 1 1 RG
+2.834645669291339 0 0 -2.834645669291339 0 1162.204724409449 cm
+/Fnt0 12.0 Tf
+q
+0 J
+
+/Fnt0 12.0 Tf
+0 0 m 420 0 l 420 410 l 0 410 l 0 0 l h f
+Q
+q
+0 0 0 rg 0 0 0 RG
+0 J
+
+/Fnt0 12.0 Tf
+43.45 38.4 m 48.825 35.275 l 48.825 29.025 l 43.45 25.9 l 38.075 29.025 l 38.075 35.275 l h f
+68.05 38.4 m 73.425 35.275 l 73.425 29.025 l 68.05 25.9 l 62.675 29.025 l 62.675 35.275 l h f
+92.65 38.4 m 98.025 35.275 l 98.025 29.025 l 92.65 25.9 l 87.275 29.025 l 87.275 35.275 l h f
+117.25 38.4 m 122.625 35.275 l 122.625 29.025 l 117.25 25.9 l 111.875 29.025 l 111.875 35.275 l h f
+141.85000000000002 38.4 m 147.225 35.275 l 147.225 29.025 l 141.85000000000002 25.9 l 136.47500000000002 29.025 l 136.47500000000002 35.275 l h f
+166.45 38.4 m 171.825 35.275 l 171.825 29.025 l 166.45 25.9 l 161.075 29.025 l 161.075 35.275 l h f
+191.05 38.4 m 196.425 35.275 l 196.425 29.025 l 191.05 25.9 l 185.67499999999998 29.025 l 185.67499999999998 35.275 l h f
+215.64999999999998 38.4 m 221.02499999999998 35.275 l 221.02499999999998 29.025 l 215.64999999999998 25.9 l 210.27499999999998 29.025 l 210.27499999999998 35.275 l h f
+240.25 38.4 m 245.625 35.275 l 245.625 29.025 l 240.25 25.9 l 234.87499999999997 29.025 l 234.87499999999997 35.275 l h f
+264.85 38.4 m 270.225 35.275 l 270.225 29.025 l 264.85 25.9 l 259.47499999999997 29.025 l 259.47499999999997 35.275 l h f
+289.45 38.4 m 294.825 35.275 l 294.825 29.025 l 289.45 25.9 l 284.07499999999993 29.025 l 284.07499999999993 35.275 l h f
+314.04999999999995 38.4 m 319.425 35.275 l 319.425 29.025 l 314.04999999999995 25.9 l 308.67499999999995 29.025 l 308.67499999999995 35.275 l h f
+338.65 38.4 m 344.025 35.275 l 344.025 29.025 l 338.65 25.9 l 333.275 29.025 l 333.275 35.275 l h f
+363.25 38.4 m 368.62500000000006 35.275 l 368.62500000000006 29.025 l 363.25 25.9 l 357.875 29.025 l 357.875 35.275 l h f
+375.55 38.4 m 380.925 35.275 l 380.925 29.025 l 375.55 25.9 l 370.17499999999995 29.025 l 370.17499999999995 35.275 l h f
+387.85 38.4 m 393.225 35.275 l 393.225 29.025 l 387.85 25.9 l 382.475 29.025 l 382.475 35.275 l h f
+31.15 59.75 m 36.525 56.625 l 36.525 50.375 l 31.15 47.25 l 25.775 50.375 l 25.775 56.625 l h f
+55.75 59.75 m 61.125 56.625 l 61.125 50.375 l 55.75 47.25 l 50.375 50.375 l 50.375 56.625 l h f
+80.35 59.75 m 85.725 56.625 l 85.725 50.375 l 80.35 47.25 l 74.97500000000001 50.375 l 74.97500000000001 56.625 l h f
+104.95 59.75 m 110.325 56.625 l 110.325 50.375 l 104.95 47.25 l 99.575 50.375 l 99.575 56.625 l h f
+129.55 59.75 m 134.925 56.625 l 134.925 50.375 l 129.55 47.25 l 124.17500000000001 50.375 l 124.17500000000001 56.625 l h f
+154.15 59.75 m 159.525 56.625 l 159.525 50.375 l 154.15 47.25 l 148.775 50.375 l 148.775 56.625 l h f
+178.75 59.75 m 184.125 56.625 l 184.125 50.375 l 178.75 47.25 l 173.375 50.375 l 173.375 56.625 l h f
+203.34999999999997 59.75 m 208.725 56.625 l 208.725 50.375 l 203.34999999999997 47.25 l 197.97499999999997 50.375 l 197.97499999999997 56.625 l h f
+227.95 59.75 m 233.325 56.625 l 233.325 50.375 l 227.95 47.25 l 222.57499999999996 50.375 l 222.57499999999996 56.625 l h f
+252.54999999999998 59.75 m 257.925 56.625 l 257.925 50.375 l 252.54999999999998 47.25 l 247.17499999999998 50.375 l 247.17499999999998 56.625 l h f
+277.15 59.75 m 282.52500000000003 56.625 l 282.52500000000003 50.375 l 277.15 47.25 l 271.775 50.375 l 271.775 56.625 l h f
+301.75 59.75 m 307.125 56.625 l 307.125 50.375 l 301.75 47.25 l 296.37499999999994 50.375 l 296.37499999999994 56.625 l h f
+326.34999999999997 59.75 m 331.725 56.625 l 331.725 50.375 l 326.34999999999997 47.25 l 320.97499999999997 50.375 l 320.97499999999997 56.625 l h f
+350.95 59.75 m 356.325 56.625 l 356.325 50.375 l 350.95 47.25 l 345.575 50.375 l 345.575 56.625 l h f
+375.55 59.75 m 380.925 56.625 l 380.925 50.375 l 375.55 47.25 l 370.17499999999995 50.375 l 370.17499999999995 56.625 l h f
+49.6 70.425 m 54.975 67.3 l 54.975 61.05 l 49.6 57.925 l 44.224999999999994 61.05 l 44.224999999999994 67.3 l h f
+74.2 70.425 m 79.57499999999999 67.3 l 79.57499999999999 61.05 l 74.2 57.925 l 68.825 61.05 l 68.825 67.3 l h f
+98.80000000000001 70.425 m 104.17500000000001 67.3 l 104.17500000000001 61.05 l 98.80000000000001 57.925 l 93.42500000000001 61.05 l 93.42500000000001 67.3 l h f
+123.4 70.425 m 128.77499999999998 67.3 l 128.77499999999998 61.05 l 123.4 57.925 l 118.025 61.05 l 118.025 67.3 l h f
+148 70.425 m 153.375 67.3 l 153.375 61.05 l 148 57.925 l 142.625 61.05 l 142.625 67.3 l h f
+172.6 70.425 m 177.975 67.3 l 177.975 61.05 l 172.6 57.925 l 167.225 61.05 l 167.225 67.3 l h f
+197.2 70.425 m 202.575 67.3 l 202.575 61.05 l 197.2 57.925 l 191.825 61.05 l 191.825 67.3 l h f
+221.79999999999995 70.425 m 227.17499999999998 67.3 l 227.17499999999998 61.05 l 221.79999999999995 57.925 l 216.42499999999995 61.05 l 216.42499999999995 67.3 l h f
+246.39999999999998 70.425 m 251.77499999999998 67.3 l 251.77499999999998 61.05 l 246.39999999999998 57.925 l 241.02499999999995 61.05 l 241.02499999999995 67.3 l h f
+271 70.425 m 276.375 67.3 l 276.375 61.05 l 271 57.925 l 265.625 61.05 l 265.625 67.3 l h f
+295.59999999999997 70.425 m 300.97499999999997 67.3 l 300.97499999999997 61.05 l 295.59999999999997 57.925 l 290.2249999999999 61.05 l 290.2249999999999 67.3 l h f
+320.19999999999993 70.425 m 325.575 67.3 l 325.575 61.05 l 320.19999999999993 57.925 l 314.82499999999993 61.05 l 314.82499999999993 67.3 l h f
+344.79999999999995 70.425 m 350.17499999999995 67.3 l 350.17499999999995 61.05 l 344.79999999999995 57.925 l 339.42499999999995 61.05 l 339.42499999999995 67.3 l h f
+369.40000000000003 70.425 m 374.7750000000001 67.3 l 374.7750000000001 61.05 l 369.40000000000003 57.925 l 364.02500000000003 61.05 l 364.02500000000003 67.3 l h f
+381.70000000000005 70.425 m 387.07500000000005 67.3 l 387.07500000000005 61.05 l 381.70000000000005 57.925 l 376.325 61.05 l 376.325 67.3 l h f
+387.85 81.1 m 393.225 77.975 l 393.225 71.725 l 387.85 68.6 l 382.475 71.725 l 382.475 77.975 l h f
+37.3 91.77499999999999 m 42.675 88.64999999999999 l 42.675 82.39999999999999 l 37.3 79.27499999999999 l 31.925 82.39999999999999 l 31.925 88.64999999999999 l h f
+61.900000000000006 91.77499999999999 m 67.275 88.64999999999999 l 67.275 82.39999999999999 l 61.900000000000006 79.27499999999999 l 56.525000000000006 82.39999999999999 l 56.525000000000006 88.64999999999999 l h f
+86.5 91.77499999999999 m 91.875 88.64999999999999 l 91.875 82.39999999999999 l 86.5 79.27499999999999 l 81.125 82.39999999999999 l 81.125 88.64999999999999 l h f
+111.1 91.77499999999999 m 116.475 88.64999999999999 l 116.475 82.39999999999999 l 111.1 79.27499999999999 l 105.725 82.39999999999999 l 105.725 88.64999999999999 l h f
+135.7 91.77499999999999 m 141.075 88.64999999999999 l 141.075 82.39999999999999 l 135.7 79.27499999999999 l 130.325 82.39999999999999 l 130.325 88.64999999999999 l h f
+160.3 91.77499999999999 m 165.675 88.64999999999999 l 165.675 82.39999999999999 l 160.3 79.27499999999999 l 154.925 82.39999999999999 l 154.925 88.64999999999999 l h f
+184.9 91.77499999999999 m 190.275 88.64999999999999 l 190.275 82.39999999999999 l 184.9 79.27499999999999 l 179.525 82.39999999999999 l 179.525 88.64999999999999 l h f
+209.49999999999994 91.77499999999999 m 214.87499999999997 88.64999999999999 l 214.87499999999997 82.39999999999999 l 209.49999999999994 79.27499999999999 l 204.12499999999994 82.39999999999999 l 204.12499999999994 88.64999999999999 l h f
+234.09999999999997 91.77499999999999 m 239.47499999999997 88.64999999999999 l 239.47499999999997 82.39999999999999 l 234.09999999999997 79.27499999999999 l 228.72499999999997 82.39999999999999 l 228.72499999999997 88.64999999999999 l h f
+258.7 91.77499999999999 m 264.075 88.64999999999999 l 264.075 82.39999999999999 l 258.7 79.27499999999999 l 253.32499999999996 82.39999999999999 l 253.32499999999996 88.64999999999999 l h f
+283.29999999999995 91.77499999999999 m 288.675 88.64999999999999 l 288.675 82.39999999999999 l 283.29999999999995 79.27499999999999 l 277.92499999999995 82.39999999999999 l 277.92499999999995 88.64999999999999 l h f
+307.9 91.77499999999999 m 313.275 88.64999999999999 l 313.275 82.39999999999999 l 307.9 79.27499999999999 l 302.5249999999999 82.39999999999999 l 302.5249999999999 88.64999999999999 l h f
+332.49999999999994 91.77499999999999 m 337.875 88.64999999999999 l 337.875 82.39999999999999 l 332.49999999999994 79.27499999999999 l 327.12499999999994 82.39999999999999 l 327.12499999999994 88.64999999999999 l h f
+357.1 91.77499999999999 m 362.475 88.64999999999999 l 362.475 82.39999999999999 l 357.1 79.27499999999999 l 351.725 82.39999999999999 l 351.725 88.64999999999999 l h f
+43.45 102.44999999999999 m 48.825 99.32499999999999 l 48.825 93.07499999999999 l 43.45 89.94999999999999 l 38.075 93.07499999999999 l 38.075 99.32499999999999 l h f
+68.05 102.44999999999999 m 73.425 99.32499999999999 l 73.425 93.07499999999999 l 68.05 89.94999999999999 l 62.675 93.07499999999999 l 62.675 99.32499999999999 l h f
+92.65 102.44999999999999 m 98.025 99.32499999999999 l 98.025 93.07499999999999 l 92.65 89.94999999999999 l 87.275 93.07499999999999 l 87.275 99.32499999999999 l h f
+117.25 102.44999999999999 m 122.625 99.32499999999999 l 122.625 93.07499999999999 l 117.25 89.94999999999999 l 111.875 93.07499999999999 l 111.875 99.32499999999999 l h f
+141.85000000000002 102.44999999999999 m 147.225 99.32499999999999 l 147.225 93.07499999999999 l 141.85000000000002 89.94999999999999 l 136.47500000000002 93.07499999999999 l 136.47500000000002 99.32499999999999 l h f
+166.45 102.44999999999999 m 171.825 99.32499999999999 l 171.825 93.07499999999999 l 166.45 89.94999999999999 l 161.075 93.07499999999999 l 161.075 99.32499999999999 l h f
+191.05 102.44999999999999 m 196.425 99.32499999999999 l 196.425 93.07499999999999 l 191.05 89.94999999999999 l 185.67499999999998 93.07499999999999 l 185.67499999999998 99.32499999999999 l h f
+215.64999999999998 102.44999999999999 m 221.02499999999998 99.32499999999999 l 221.02499999999998 93.07499999999999 l 215.64999999999998 89.94999999999999 l 210.27499999999998 93.07499999999999 l 210.27499999999998 99.32499999999999 l h f
+240.25 102.44999999999999 m 245.625 99.32499999999999 l 245.625 93.07499999999999 l 240.25 89.94999999999999 l 234.87499999999997 93.07499999999999 l 234.87499999999997 99.32499999999999 l h f
+264.85 102.44999999999999 m 270.225 99.32499999999999 l 270.225 93.07499999999999 l 264.85 89.94999999999999 l 259.47499999999997 93.07499999999999 l 259.47499999999997 99.32499999999999 l h f
+289.45 102.44999999999999 m 294.825 99.32499999999999 l 294.825 93.07499999999999 l 289.45 89.94999999999999 l 284.07499999999993 93.07499999999999 l 284.07499999999993 99.32499999999999 l h f
+314.04999999999995 102.44999999999999 m 319.425 99.32499999999999 l 319.425 93.07499999999999 l 314.04999999999995 89.94999999999999 l 308.67499999999995 93.07499999999999 l 308.67499999999995 99.32499999999999 l h f
+338.65 102.44999999999999 m 344.025 99.32499999999999 l 344.025 93.07499999999999 l 338.65 89.94999999999999 l 333.275 93.07499999999999 l 333.275 99.32499999999999 l h f
+363.25 102.44999999999999 m 368.62500000000006 99.32499999999999 l 368.62500000000006 93.07499999999999 l 363.25 89.94999999999999 l 357.875 93.07499999999999 l 357.875 99.32499999999999 l h f
+375.55 102.44999999999999 m 380.925 99.32499999999999 l 380.925 93.07499999999999 l 375.55 89.94999999999999 l 370.17499999999995 93.07499999999999 l 370.17499999999995 99.32499999999999 l h f
+381.70000000000005 113.125 m 387.07500000000005 110 l 387.07500000000005 103.75 l 381.70000000000005 100.625 l 376.325 103.75 l 376.325 110 l h f
+31.15 123.79999999999998 m 36.525 120.67499999999998 l 36.525 114.42499999999998 l 31.15 111.29999999999998 l 25.775 114.42499999999998 l 25.775 120.67499999999998 l h f
+55.75 123.79999999999998 m 61.125 120.67499999999998 l 61.125 114.42499999999998 l 55.75 111.29999999999998 l 50.375 114.42499999999998 l 50.375 120.67499999999998 l h f
+80.35 123.79999999999998 m 85.725 120.67499999999998 l 85.725 114.42499999999998 l 80.35 111.29999999999998 l 74.97500000000001 114.42499999999998 l 74.97500000000001 120.67499999999998 l h f
+104.95 123.79999999999998 m 110.325 120.67499999999998 l 110.325 114.42499999999998 l 104.95 111.29999999999998 l 99.575 114.42499999999998 l 99.575 120.67499999999998 l h f
+129.55 123.79999999999998 m 134.925 120.67499999999998 l 134.925 114.42499999999998 l 129.55 111.29999999999998 l 124.17500000000001 114.42499999999998 l 124.17500000000001 120.67499999999998 l h f
+154.15 123.79999999999998 m 159.525 120.67499999999998 l 159.525 114.42499999999998 l 154.15 111.29999999999998 l 148.775 114.42499999999998 l 148.775 120.67499999999998 l h f
+178.75 123.79999999999998 m 184.125 120.67499999999998 l 184.125 114.42499999999998 l 178.75 111.29999999999998 l 173.375 114.42499999999998 l 173.375 120.67499999999998 l h f
+203.34999999999997 123.79999999999998 m 208.725 120.67499999999998 l 208.725 114.42499999999998 l 203.34999999999997 111.29999999999998 l 197.97499999999997 114.42499999999998 l 197.97499999999997 120.67499999999998 l h f
+227.95 123.79999999999998 m 233.325 120.67499999999998 l 233.325 114.42499999999998 l 227.95 111.29999999999998 l 222.57499999999996 114.42499999999998 l 222.57499999999996 120.67499999999998 l h f
+252.54999999999998 123.79999999999998 m 257.925 120.67499999999998 l 257.925 114.42499999999998 l 252.54999999999998 111.29999999999998 l 247.17499999999998 114.42499999999998 l 247.17499999999998 120.67499999999998 l h f
+277.15 123.79999999999998 m 282.52500000000003 120.67499999999998 l 282.52500000000003 114.42499999999998 l 277.15 111.29999999999998 l 271.775 114.42499999999998 l 271.775 120.67499999999998 l h f
+301.75 123.79999999999998 m 307.125 120.67499999999998 l 307.125 114.42499999999998 l 301.75 111.29999999999998 l 296.37499999999994 114.42499999999998 l 296.37499999999994 120.67499999999998 l h f
+326.34999999999997 123.79999999999998 m 331.725 120.67499999999998 l 331.725 114.42499999999998 l 326.34999999999997 111.29999999999998 l 320.97499999999997 114.42499999999998 l 320.97499999999997 120.67499999999998 l h f
+350.95 123.79999999999998 m 356.325 120.67499999999998 l 356.325 114.42499999999998 l 350.95 111.29999999999998 l 345.575 114.42499999999998 l 345.575 120.67499999999998 l h f
+387.85 123.79999999999998 m 393.225 120.67499999999998 l 393.225 114.42499999999998 l 387.85 111.29999999999998 l 382.475 114.42499999999998 l 382.475 120.67499999999998 l h f
+49.6 134.47499999999997 m 54.975 131.34999999999997 l 54.975 125.09999999999998 l 49.6 121.97499999999998 l 44.224999999999994 125.09999999999998 l 44.224999999999994 131.34999999999997 l h f
+74.2 134.47499999999997 m 79.57499999999999 131.34999999999997 l 79.57499999999999 125.09999999999998 l 74.2 121.97499999999998 l 68.825 125.09999999999998 l 68.825 131.34999999999997 l h f
+98.80000000000001 134.47499999999997 m 104.17500000000001 131.34999999999997 l 104.17500000000001 125.09999999999998 l 98.80000000000001 121.97499999999998 l 93.42500000000001 125.09999999999998 l 93.42500000000001 131.34999999999997 l h f
+123.4 134.47499999999997 m 128.77499999999998 131.34999999999997 l 128.77499999999998 125.09999999999998 l 123.4 121.97499999999998 l 118.025 125.09999999999998 l 118.025 131.34999999999997 l h f
+135.7 134.47499999999997 m 141.075 131.34999999999997 l 141.075 125.09999999999998 l 135.7 121.97499999999998 l 130.325 125.09999999999998 l 130.325 131.34999999999997 l h f
+148 134.47499999999997 m 153.375 131.34999999999997 l 153.375 125.09999999999998 l 148 121.97499999999998 l 142.625 125.09999999999998 l 142.625 131.34999999999997 l h f
+160.3 134.47499999999997 m 165.675 131.34999999999997 l 165.675 125.09999999999998 l 160.3 121.97499999999998 l 154.925 125.09999999999998 l 154.925 131.34999999999997 l h f
+172.6 134.47499999999997 m 177.975 131.34999999999997 l 177.975 125.09999999999998 l 172.6 121.97499999999998 l 167.225 125.09999999999998 l 167.225 131.34999999999997 l h f
+209.49999999999994 134.47499999999997 m 214.87499999999997 131.34999999999997 l 214.87499999999997 125.09999999999998 l 209.49999999999994 121.97499999999998 l 204.12499999999994 125.09999999999998 l 204.12499999999994 131.34999999999997 l h f
+283.29999999999995 134.47499999999997 m 288.675 131.34999999999997 l 288.675 125.09999999999998 l 283.29999999999995 121.97499999999998 l 277.92499999999995 125.09999999999998 l 277.92499999999995 131.34999999999997 l h f
+295.59999999999997 134.47499999999997 m 300.97499999999997 131.34999999999997 l 300.97499999999997 125.09999999999998 l 295.59999999999997 121.97499999999998 l 290.2249999999999 125.09999999999998 l 290.2249999999999 131.34999999999997 l h f
+320.19999999999993 134.47499999999997 m 325.575 131.34999999999997 l 325.575 125.09999999999998 l 320.19999999999993 121.97499999999998 l 314.82499999999993 125.09999999999998 l 314.82499999999993 131.34999999999997 l h f
+344.79999999999995 134.47499999999997 m 350.17499999999995 131.34999999999997 l 350.17499999999995 125.09999999999998 l 344.79999999999995 121.97499999999998 l 339.42499999999995 125.09999999999998 l 339.42499999999995 131.34999999999997 l h f
+369.40000000000003 134.47499999999997 m 374.7750000000001 131.34999999999997 l 374.7750000000001 125.09999999999998 l 369.40000000000003 121.97499999999998 l 364.02500000000003 125.09999999999998 l 364.02500000000003 131.34999999999997 l h f
+166.45 145.14999999999998 m 171.825 142.02499999999998 l 171.825 135.77499999999998 l 166.45 132.64999999999998 l 161.075 135.77499999999998 l 161.075 142.02499999999998 l h f
+178.75 145.14999999999998 m 184.125 142.02499999999998 l 184.125 135.77499999999998 l 178.75 132.64999999999998 l 173.375 135.77499999999998 l 173.375 142.02499999999998 l h f
+203.34999999999997 145.14999999999998 m 208.725 142.02499999999998 l 208.725 135.77499999999998 l 203.34999999999997 132.64999999999998 l 197.97499999999997 135.77499999999998 l 197.97499999999997 142.02499999999998 l h f
+227.95 145.14999999999998 m 233.325 142.02499999999998 l 233.325 135.77499999999998 l 227.95 132.64999999999998 l 222.57499999999996 135.77499999999998 l 222.57499999999996 142.02499999999998 l h f
+277.15 145.14999999999998 m 282.52500000000003 142.02499999999998 l 282.52500000000003 135.77499999999998 l 277.15 132.64999999999998 l 271.775 135.77499999999998 l 271.775 142.02499999999998 l h f
+289.45 145.14999999999998 m 294.825 142.02499999999998 l 294.825 135.77499999999998 l 289.45 132.64999999999998 l 284.07499999999993 135.77499999999998 l 284.07499999999993 142.02499999999998 l h f
+37.3 155.825 m 42.675 152.7 l 42.675 146.45 l 37.3 143.325 l 31.925 146.45 l 31.925 152.7 l h f
+61.900000000000006 155.825 m 67.275 152.7 l 67.275 146.45 l 61.900000000000006 143.325 l 56.525000000000006 146.45 l 56.525000000000006 152.7 l h f
+86.5 155.825 m 91.875 152.7 l 91.875 146.45 l 86.5 143.325 l 81.125 146.45 l 81.125 152.7 l h f
+111.1 155.825 m 116.475 152.7 l 116.475 146.45 l 111.1 143.325 l 105.725 146.45 l 105.725 152.7 l h f
+160.3 155.825 m 165.675 152.7 l 165.675 146.45 l 160.3 143.325 l 154.925 146.45 l 154.925 152.7 l h f
+258.7 155.825 m 264.075 152.7 l 264.075 146.45 l 258.7 143.325 l 253.32499999999996 146.45 l 253.32499999999996 152.7 l h f
+283.29999999999995 155.825 m 288.675 152.7 l 288.675 146.45 l 283.29999999999995 143.325 l 277.92499999999995 146.45 l 277.92499999999995 152.7 l h f
+307.9 155.825 m 313.275 152.7 l 313.275 146.45 l 307.9 143.325 l 302.5249999999999 146.45 l 302.5249999999999 152.7 l h f
+332.49999999999994 155.825 m 337.875 152.7 l 337.875 146.45 l 332.49999999999994 143.325 l 327.12499999999994 146.45 l 327.12499999999994 152.7 l h f
+357.1 155.825 m 362.475 152.7 l 362.475 146.45 l 357.1 143.325 l 351.725 146.45 l 351.725 152.7 l h f
+381.70000000000005 155.825 m 387.07500000000005 152.7 l 387.07500000000005 146.45 l 381.70000000000005 143.325 l 376.325 146.45 l 376.325 152.7 l h f
+43.45 166.5 m 48.825 163.375 l 48.825 157.125 l 43.45 154 l 38.075 157.125 l 38.075 163.375 l h f
+68.05 166.5 m 73.425 163.375 l 73.425 157.125 l 68.05 154 l 62.675 157.125 l 62.675 163.375 l h f
+92.65 166.5 m 98.025 163.375 l 98.025 157.125 l 92.65 154 l 87.275 157.125 l 87.275 163.375 l h f
+117.25 166.5 m 122.625 163.375 l 122.625 157.125 l 117.25 154 l 111.875 157.125 l 111.875 163.375 l h f
+141.85000000000002 166.5 m 147.225 163.375 l 147.225 157.125 l 141.85000000000002 154 l 136.47500000000002 157.125 l 136.47500000000002 163.375 l h f
+154.15 166.5 m 159.525 163.375 l 159.525 157.125 l 154.15 154 l 148.775 157.125 l 148.775 163.375 l h f
+264.85 166.5 m 270.225 163.375 l 270.225 157.125 l 264.85 154 l 259.47499999999997 157.125 l 259.47499999999997 163.375 l h f
+277.15 166.5 m 282.52500000000003 163.375 l 282.52500000000003 157.125 l 277.15 154 l 271.775 157.125 l 271.775 163.375 l h f
+314.04999999999995 166.5 m 319.425 163.375 l 319.425 157.125 l 314.04999999999995 154 l 308.67499999999995 157.125 l 308.67499999999995 163.375 l h f
+338.65 166.5 m 344.025 163.375 l 344.025 157.125 l 338.65 154 l 333.275 157.125 l 333.275 163.375 l h f
+363.25 166.5 m 368.62500000000006 163.375 l 368.62500000000006 157.125 l 363.25 154 l 357.875 157.125 l 357.875 163.375 l h f
+375.55 166.5 m 380.925 163.375 l 380.925 157.125 l 375.55 154 l 370.17499999999995 157.125 l 370.17499999999995 163.375 l h f
+111.1 177.17499999999998 m 116.475 174.04999999999998 l 116.475 167.79999999999998 l 111.1 164.67499999999998 l 105.725 167.79999999999998 l 105.725 174.04999999999998 l h f
+258.7 177.17499999999998 m 264.075 174.04999999999998 l 264.075 167.79999999999998 l 258.7 164.67499999999998 l 253.32499999999996 167.79999999999998 l 253.32499999999996 174.04999999999998 l h f
+271 177.17499999999998 m 276.375 174.04999999999998 l 276.375 167.79999999999998 l 271 164.67499999999998 l 265.625 167.79999999999998 l 265.625 174.04999999999998 l h f
+283.29999999999995 177.17499999999998 m 288.675 174.04999999999998 l 288.675 167.79999999999998 l 283.29999999999995 164.67499999999998 l 277.92499999999995 167.79999999999998 l 277.92499999999995 174.04999999999998 l h f
+295.59999999999997 177.17499999999998 m 300.97499999999997 174.04999999999998 l 300.97499999999997 167.79999999999998 l 295.59999999999997 164.67499999999998 l 290.2249999999999 167.79999999999998 l 290.2249999999999 174.04999999999998 l h f
+31.15 187.84999999999997 m 36.525 184.725 l 36.525 178.475 l 31.15 175.35 l 25.775 178.475 l 25.775 184.725 l h f
+55.75 187.84999999999997 m 61.125 184.725 l 61.125 178.475 l 55.75 175.35 l 50.375 178.475 l 50.375 184.725 l h f
+80.35 187.84999999999997 m 85.725 184.725 l 85.725 178.475 l 80.35 175.35 l 74.97500000000001 178.475 l 74.97500000000001 184.725 l h f
+104.95 187.84999999999997 m 110.325 184.725 l 110.325 178.475 l 104.95 175.35 l 99.575 178.475 l 99.575 184.725 l h f
+129.55 187.84999999999997 m 134.925 184.725 l 134.925 178.475 l 129.55 175.35 l 124.17500000000001 178.475 l 124.17500000000001 184.725 l h f
+277.15 187.84999999999997 m 282.52500000000003 184.725 l 282.52500000000003 178.475 l 277.15 175.35 l 271.775 178.475 l 271.775 184.725 l h f
+301.75 187.84999999999997 m 307.125 184.725 l 307.125 178.475 l 301.75 175.35 l 296.37499999999994 178.475 l 296.37499999999994 184.725 l h f
+326.34999999999997 187.84999999999997 m 331.725 184.725 l 331.725 178.475 l 326.34999999999997 175.35 l 320.97499999999997 178.475 l 320.97499999999997 184.725 l h f
+350.95 187.84999999999997 m 356.325 184.725 l 356.325 178.475 l 350.95 175.35 l 345.575 178.475 l 345.575 184.725 l h f
+49.6 198.52499999999998 m 54.975 195.39999999999998 l 54.975 189.14999999999998 l 49.6 186.02499999999998 l 44.224999999999994 189.14999999999998 l 44.224999999999994 195.39999999999998 l h f
+74.2 198.52499999999998 m 79.57499999999999 195.39999999999998 l 79.57499999999999 189.14999999999998 l 74.2 186.02499999999998 l 68.825 189.14999999999998 l 68.825 195.39999999999998 l h f
+98.80000000000001 198.52499999999998 m 104.17500000000001 195.39999999999998 l 104.17500000000001 189.14999999999998 l 98.80000000000001 186.02499999999998 l 93.42500000000001 189.14999999999998 l 93.42500000000001 195.39999999999998 l h f
+111.1 198.52499999999998 m 116.475 195.39999999999998 l 116.475 189.14999999999998 l 111.1 186.02499999999998 l 105.725 189.14999999999998 l 105.725 195.39999999999998 l h f
+123.4 198.52499999999998 m 128.77499999999998 195.39999999999998 l 128.77499999999998 189.14999999999998 l 123.4 186.02499999999998 l 118.025 189.14999999999998 l 118.025 195.39999999999998 l h f
+135.7 198.52499999999998 m 141.075 195.39999999999998 l 141.075 189.14999999999998 l 135.7 186.02499999999998 l 130.325 189.14999999999998 l 130.325 195.39999999999998 l h f
+283.29999999999995 198.52499999999998 m 288.675 195.39999999999998 l 288.675 189.14999999999998 l 283.29999999999995 186.02499999999998 l 277.92499999999995 189.14999999999998 l 277.92499999999995 195.39999999999998 l h f
+320.19999999999993 198.52499999999998 m 325.575 195.39999999999998 l 325.575 189.14999999999998 l 320.19999999999993 186.02499999999998 l 314.82499999999993 189.14999999999998 l 314.82499999999993 195.39999999999998 l h f
+344.79999999999995 198.52499999999998 m 350.17499999999995 195.39999999999998 l 350.17499999999995 189.14999999999998 l 344.79999999999995 186.02499999999998 l 339.42499999999995 189.14999999999998 l 339.42499999999995 195.39999999999998 l h f
+369.40000000000003 198.52499999999998 m 374.7750000000001 195.39999999999998 l 374.7750000000001 189.14999999999998 l 369.40000000000003 186.02499999999998 l 364.02500000000003 189.14999999999998 l 364.02500000000003 195.39999999999998 l h f
+381.70000000000005 198.52499999999998 m 387.07500000000005 195.39999999999998 l 387.07500000000005 189.14999999999998 l 381.70000000000005 186.02499999999998 l 376.325 189.14999999999998 l 376.325 195.39999999999998 l h f
+129.55 209.2 m 134.925 206.075 l 134.925 199.825 l 129.55 196.7 l 124.17500000000001 199.825 l 124.17500000000001 206.075 l h f
+277.15 209.2 m 282.52500000000003 206.075 l 282.52500000000003 199.825 l 277.15 196.7 l 271.775 199.825 l 271.775 206.075 l h f
+375.55 209.2 m 380.925 206.075 l 380.925 199.825 l 375.55 196.7 l 370.17499999999995 199.825 l 370.17499999999995 206.075 l h f
+37.3 219.87499999999997 m 42.675 216.74999999999997 l 42.675 210.49999999999997 l 37.3 207.37499999999997 l 31.925 210.49999999999997 l 31.925 216.74999999999997 l h f
+61.900000000000006 219.87499999999997 m 67.275 216.74999999999997 l 67.275 210.49999999999997 l 61.900000000000006 207.37499999999997 l 56.525000000000006 210.49999999999997 l 56.525000000000006 216.74999999999997 l h f
+86.5 219.87499999999997 m 91.875 216.74999999999997 l 91.875 210.49999999999997 l 86.5 207.37499999999997 l 81.125 210.49999999999997 l 81.125 216.74999999999997 l h f
+135.7 219.87499999999997 m 141.075 216.74999999999997 l 141.075 210.49999999999997 l 135.7 207.37499999999997 l 130.325 210.49999999999997 l 130.325 216.74999999999997 l h f
+283.29999999999995 219.87499999999997 m 288.675 216.74999999999997 l 288.675 210.49999999999997 l 283.29999999999995 207.37499999999997 l 277.92499999999995 210.49999999999997 l 277.92499999999995 216.74999999999997 l h f
+295.59999999999997 219.87499999999997 m 300.97499999999997 216.74999999999997 l 300.97499999999997 210.49999999999997 l 295.59999999999997 207.37499999999997 l 290.2249999999999 210.49999999999997 l 290.2249999999999 216.74999999999997 l h f
+307.9 219.87499999999997 m 313.275 216.74999999999997 l 313.275 210.49999999999997 l 307.9 207.37499999999997 l 302.5249999999999 210.49999999999997 l 302.5249999999999 216.74999999999997 l h f
+332.49999999999994 219.87499999999997 m 337.875 216.74999999999997 l 337.875 210.49999999999997 l 332.49999999999994 207.37499999999997 l 327.12499999999994 210.49999999999997 l 327.12499999999994 216.74999999999997 l h f
+357.1 219.87499999999997 m 362.475 216.74999999999997 l 362.475 210.49999999999997 l 357.1 207.37499999999997 l 351.725 210.49999999999997 l 351.725 216.74999999999997 l h f
+43.45 230.54999999999995 m 48.825 227.42499999999995 l 48.825 221.17499999999995 l 43.45 218.04999999999995 l 38.075 221.17499999999995 l 38.075 227.42499999999995 l h f
+68.05 230.54999999999995 m 73.425 227.42499999999995 l 73.425 221.17499999999995 l 68.05 218.04999999999995 l 62.675 221.17499999999995 l 62.675 227.42499999999995 l h f
+92.65 230.54999999999995 m 98.025 227.42499999999995 l 98.025 221.17499999999995 l 92.65 218.04999999999995 l 87.275 221.17499999999995 l 87.275 227.42499999999995 l h f
+117.25 230.54999999999995 m 122.625 227.42499999999995 l 122.625 221.17499999999995 l 117.25 218.04999999999995 l 111.875 221.17499999999995 l 111.875 227.42499999999995 l h f
+141.85000000000002 230.54999999999995 m 147.225 227.42499999999995 l 147.225 221.17499999999995 l 141.85000000000002 218.04999999999995 l 136.47500000000002 221.17499999999995 l 136.47500000000002 227.42499999999995 l h f
+264.85 230.54999999999995 m 270.225 227.42499999999995 l 270.225 221.17499999999995 l 264.85 218.04999999999995 l 259.47499999999997 221.17499999999995 l 259.47499999999997 227.42499999999995 l h f
+277.15 230.54999999999995 m 282.52500000000003 227.42499999999995 l 282.52500000000003 221.17499999999995 l 277.15 218.04999999999995 l 271.775 221.17499999999995 l 271.775 227.42499999999995 l h f
+289.45 230.54999999999995 m 294.825 227.42499999999995 l 294.825 221.17499999999995 l 289.45 218.04999999999995 l 284.07499999999993 221.17499999999995 l 284.07499999999993 227.42499999999995 l h f
+314.04999999999995 230.54999999999995 m 319.425 227.42499999999995 l 319.425 221.17499999999995 l 314.04999999999995 218.04999999999995 l 308.67499999999995 221.17499999999995 l 308.67499999999995 227.42499999999995 l h f
+338.65 230.54999999999995 m 344.025 227.42499999999995 l 344.025 221.17499999999995 l 338.65 218.04999999999995 l 333.275 221.17499999999995 l 333.275 227.42499999999995 l h f
+363.25 230.54999999999995 m 368.62500000000006 227.42499999999995 l 368.62500000000006 221.17499999999995 l 363.25 218.04999999999995 l 357.875 221.17499999999995 l 357.875 227.42499999999995 l h f
+375.55 230.54999999999995 m 380.925 227.42499999999995 l 380.925 221.17499999999995 l 375.55 218.04999999999995 l 370.17499999999995 221.17499999999995 l 370.17499999999995 227.42499999999995 l h f
+387.85 230.54999999999995 m 393.225 227.42499999999995 l 393.225 221.17499999999995 l 387.85 218.04999999999995 l 382.475 221.17499999999995 l 382.475 227.42499999999995 l h f
+111.1 241.225 m 116.475 238.1 l 116.475 231.85 l 111.1 228.725 l 105.725 231.85 l 105.725 238.1 l h f
+135.7 241.225 m 141.075 238.1 l 141.075 231.85 l 135.7 228.725 l 130.325 231.85 l 130.325 238.1 l h f
+148 241.225 m 153.375 238.1 l 153.375 231.85 l 148 228.725 l 142.625 231.85 l 142.625 238.1 l h f
+271 241.225 m 276.375 238.1 l 276.375 231.85 l 271 228.725 l 265.625 231.85 l 265.625 238.1 l h f
+381.70000000000005 241.225 m 387.07500000000005 238.1 l 387.07500000000005 231.85 l 381.70000000000005 228.725 l 376.325 231.85 l 376.325 238.1 l h f
+31.15 251.89999999999998 m 36.525 248.77499999999998 l 36.525 242.52499999999998 l 31.15 239.39999999999998 l 25.775 242.52499999999998 l 25.775 248.77499999999998 l h f
+55.75 251.89999999999998 m 61.125 248.77499999999998 l 61.125 242.52499999999998 l 55.75 239.39999999999998 l 50.375 242.52499999999998 l 50.375 248.77499999999998 l h f
+80.35 251.89999999999998 m 85.725 248.77499999999998 l 85.725 242.52499999999998 l 80.35 239.39999999999998 l 74.97500000000001 242.52499999999998 l 74.97500000000001 248.77499999999998 l h f
+117.25 251.89999999999998 m 122.625 248.77499999999998 l 122.625 242.52499999999998 l 117.25 239.39999999999998 l 111.875 242.52499999999998 l 111.875 248.77499999999998 l h f
+141.85000000000002 251.89999999999998 m 147.225 248.77499999999998 l 147.225 242.52499999999998 l 141.85000000000002 239.39999999999998 l 136.47500000000002 242.52499999999998 l 136.47500000000002 248.77499999999998 l h f
+154.15 251.89999999999998 m 159.525 248.77499999999998 l 159.525 242.52499999999998 l 154.15 239.39999999999998 l 148.775 242.52499999999998 l 148.775 248.77499999999998 l h f
+277.15 251.89999999999998 m 282.52500000000003 248.77499999999998 l 282.52500000000003 242.52499999999998 l 277.15 239.39999999999998 l 271.775 242.52499999999998 l 271.775 248.77499999999998 l h f
+289.45 251.89999999999998 m 294.825 248.77499999999998 l 294.825 242.52499999999998 l 289.45 239.39999999999998 l 284.07499999999993 242.52499999999998 l 284.07499999999993 248.77499999999998 l h f
+301.75 251.89999999999998 m 307.125 248.77499999999998 l 307.125 242.52499999999998 l 301.75 239.39999999999998 l 296.37499999999994 242.52499999999998 l 296.37499999999994 248.77499999999998 l h f
+326.34999999999997 251.89999999999998 m 331.725 248.77499999999998 l 331.725 242.52499999999998 l 326.34999999999997 239.39999999999998 l 320.97499999999997 242.52499999999998 l 320.97499999999997 248.77499999999998 l h f
+350.95 251.89999999999998 m 356.325 248.77499999999998 l 356.325 242.52499999999998 l 350.95 239.39999999999998 l 345.575 242.52499999999998 l 345.575 248.77499999999998 l h f
+375.55 251.89999999999998 m 380.925 248.77499999999998 l 380.925 242.52499999999998 l 375.55 239.39999999999998 l 370.17499999999995 242.52499999999998 l 370.17499999999995 248.77499999999998 l h f
+387.85 251.89999999999998 m 393.225 248.77499999999998 l 393.225 242.52499999999998 l 387.85 239.39999999999998 l 382.475 242.52499999999998 l 382.475 248.77499999999998 l h f
+49.6 262.57499999999993 m 54.975 259.44999999999993 l 54.975 253.19999999999996 l 49.6 250.07499999999996 l 44.224999999999994 253.19999999999996 l 44.224999999999994 259.44999999999993 l h f
+74.2 262.57499999999993 m 79.57499999999999 259.44999999999993 l 79.57499999999999 253.19999999999996 l 74.2 250.07499999999996 l 68.825 253.19999999999996 l 68.825 259.44999999999993 l h f
+98.80000000000001 262.57499999999993 m 104.17500000000001 259.44999999999993 l 104.17500000000001 253.19999999999996 l 98.80000000000001 250.07499999999996 l 93.42500000000001 253.19999999999996 l 93.42500000000001 259.44999999999993 l h f
+123.4 262.57499999999993 m 128.77499999999998 259.44999999999993 l 128.77499999999998 253.19999999999996 l 123.4 250.07499999999996 l 118.025 253.19999999999996 l 118.025 259.44999999999993 l h f
+148 262.57499999999993 m 153.375 259.44999999999993 l 153.375 253.19999999999996 l 148 250.07499999999996 l 142.625 253.19999999999996 l 142.625 259.44999999999993 l h f
+246.39999999999998 262.57499999999993 m 251.77499999999998 259.44999999999993 l 251.77499999999998 253.19999999999996 l 246.39999999999998 250.07499999999996 l 241.02499999999995 253.19999999999996 l 241.02499999999995 259.44999999999993 l h f
+258.7 262.57499999999993 m 264.075 259.44999999999993 l 264.075 253.19999999999996 l 258.7 250.07499999999996 l 253.32499999999996 253.19999999999996 l 253.32499999999996 259.44999999999993 l h f
+271 262.57499999999993 m 276.375 259.44999999999993 l 276.375 253.19999999999996 l 271 250.07499999999996 l 265.625 253.19999999999996 l 265.625 259.44999999999993 l h f
+283.29999999999995 262.57499999999993 m 288.675 259.44999999999993 l 288.675 253.19999999999996 l 283.29999999999995 250.07499999999996 l 277.92499999999995 253.19999999999996 l 277.92499999999995 259.44999999999993 l h f
+295.59999999999997 262.57499999999993 m 300.97499999999997 259.44999999999993 l 300.97499999999997 253.19999999999996 l 295.59999999999997 250.07499999999996 l 290.2249999999999 253.19999999999996 l 290.2249999999999 259.44999999999993 l h f
+320.19999999999993 262.57499999999993 m 325.575 259.44999999999993 l 325.575 253.19999999999996 l 320.19999999999993 250.07499999999996 l 314.82499999999993 253.19999999999996 l 314.82499999999993 259.44999999999993 l h f
+344.79999999999995 262.57499999999993 m 350.17499999999995 259.44999999999993 l 350.17499999999995 253.19999999999996 l 344.79999999999995 250.07499999999996 l 339.42499999999995 253.19999999999996 l 339.42499999999995 259.44999999999993 l h f
+369.40000000000003 262.57499999999993 m 374.7750000000001 259.44999999999993 l 374.7750000000001 253.19999999999996 l 369.40000000000003 250.07499999999996 l 364.02500000000003 253.19999999999996 l 364.02500000000003 259.44999999999993 l h f
+129.55 273.25 m 134.925 270.125 l 134.925 263.875 l 129.55 260.75 l 124.17500000000001 263.875 l 124.17500000000001 270.125 l h f
+141.85000000000002 273.25 m 147.225 270.125 l 147.225 263.875 l 141.85000000000002 260.75 l 136.47500000000002 263.875 l 136.47500000000002 270.125 l h f
+154.15 273.25 m 159.525 270.125 l 159.525 263.875 l 154.15 260.75 l 148.775 263.875 l 148.775 270.125 l h f
+178.75 273.25 m 184.125 270.125 l 184.125 263.875 l 178.75 260.75 l 173.375 263.875 l 173.375 270.125 l h f
+227.95 273.25 m 233.325 270.125 l 233.325 263.875 l 227.95 260.75 l 222.57499999999996 263.875 l 222.57499999999996 270.125 l h f
+240.25 273.25 m 245.625 270.125 l 245.625 263.875 l 240.25 260.75 l 234.87499999999997 263.875 l 234.87499999999997 270.125 l h f
+252.54999999999998 273.25 m 257.925 270.125 l 257.925 263.875 l 252.54999999999998 260.75 l 247.17499999999998 263.875 l 247.17499999999998 270.125 l h f
+277.15 273.25 m 282.52500000000003 270.125 l 282.52500000000003 263.875 l 277.15 260.75 l 271.775 263.875 l 271.775 270.125 l h f
+375.55 273.25 m 380.925 270.125 l 380.925 263.875 l 375.55 260.75 l 370.17499999999995 263.875 l 370.17499999999995 270.125 l h f
+387.85 273.25 m 393.225 270.125 l 393.225 263.875 l 387.85 260.75 l 382.475 263.875 l 382.475 270.125 l h f
+37.3 283.92499999999995 m 42.675 280.79999999999995 l 42.675 274.54999999999995 l 37.3 271.42499999999995 l 31.925 274.54999999999995 l 31.925 280.79999999999995 l h f
+61.900000000000006 283.92499999999995 m 67.275 280.79999999999995 l 67.275 274.54999999999995 l 61.900000000000006 271.42499999999995 l 56.525000000000006 274.54999999999995 l 56.525000000000006 280.79999999999995 l h f
+86.5 283.92499999999995 m 91.875 280.79999999999995 l 91.875 274.54999999999995 l 86.5 271.42499999999995 l 81.125 274.54999999999995 l 81.125 280.79999999999995 l h f
+111.1 283.92499999999995 m 116.475 280.79999999999995 l 116.475 274.54999999999995 l 111.1 271.42499999999995 l 105.725 274.54999999999995 l 105.725 280.79999999999995 l h f
+135.7 283.92499999999995 m 141.075 280.79999999999995 l 141.075 274.54999999999995 l 135.7 271.42499999999995 l 130.325 274.54999999999995 l 130.325 280.79999999999995 l h f
+160.3 283.92499999999995 m 165.675 280.79999999999995 l 165.675 274.54999999999995 l 160.3 271.42499999999995 l 154.925 274.54999999999995 l 154.925 280.79999999999995 l h f
+172.6 283.92499999999995 m 177.975 280.79999999999995 l 177.975 274.54999999999995 l 172.6 271.42499999999995 l 167.225 274.54999999999995 l 167.225 280.79999999999995 l h f
+184.9 283.92499999999995 m 190.275 280.79999999999995 l 190.275 274.54999999999995 l 184.9 271.42499999999995 l 179.525 274.54999999999995 l 179.525 280.79999999999995 l h f
+197.2 283.92499999999995 m 202.575 280.79999999999995 l 202.575 274.54999999999995 l 197.2 271.42499999999995 l 191.825 274.54999999999995 l 191.825 280.79999999999995 l h f
+209.49999999999994 283.92499999999995 m 214.87499999999997 280.79999999999995 l 214.87499999999997 274.54999999999995 l 209.49999999999994 271.42499999999995 l 204.12499999999994 274.54999999999995 l 204.12499999999994 280.79999999999995 l h f
+221.79999999999995 283.92499999999995 m 227.17499999999998 280.79999999999995 l 227.17499999999998 274.54999999999995 l 221.79999999999995 271.42499999999995 l 216.42499999999995 274.54999999999995 l 216.42499999999995 280.79999999999995 l h f
+246.39999999999998 283.92499999999995 m 251.77499999999998 280.79999999999995 l 251.77499999999998 274.54999999999995 l 246.39999999999998 271.42499999999995 l 241.02499999999995 274.54999999999995 l 241.02499999999995 280.79999999999995 l h f
+258.7 283.92499999999995 m 264.075 280.79999999999995 l 264.075 274.54999999999995 l 258.7 271.42499999999995 l 253.32499999999996 274.54999999999995 l 253.32499999999996 280.79999999999995 l h f
+307.9 283.92499999999995 m 313.275 280.79999999999995 l 313.275 274.54999999999995 l 307.9 271.42499999999995 l 302.5249999999999 274.54999999999995 l 302.5249999999999 280.79999999999995 l h f
+332.49999999999994 283.92499999999995 m 337.875 280.79999999999995 l 337.875 274.54999999999995 l 332.49999999999994 271.42499999999995 l 327.12499999999994 274.54999999999995 l 327.12499999999994 280.79999999999995 l h f
+357.1 283.92499999999995 m 362.475 280.79999999999995 l 362.475 274.54999999999995 l 357.1 271.42499999999995 l 351.725 274.54999999999995 l 351.725 280.79999999999995 l h f
+381.70000000000005 283.92499999999995 m 387.07500000000005 280.79999999999995 l 387.07500000000005 274.54999999999995 l 381.70000000000005 271.42499999999995 l 376.325 274.54999999999995 l 376.325 280.79999999999995 l h f
+43.45 294.59999999999997 m 48.825 291.47499999999997 l 48.825 285.22499999999997 l 43.45 282.09999999999997 l 38.075 285.22499999999997 l 38.075 291.47499999999997 l h f
+68.05 294.59999999999997 m 73.425 291.47499999999997 l 73.425 285.22499999999997 l 68.05 282.09999999999997 l 62.675 285.22499999999997 l 62.675 291.47499999999997 l h f
+92.65 294.59999999999997 m 98.025 291.47499999999997 l 98.025 285.22499999999997 l 92.65 282.09999999999997 l 87.275 285.22499999999997 l 87.275 291.47499999999997 l h f
+117.25 294.59999999999997 m 122.625 291.47499999999997 l 122.625 285.22499999999997 l 117.25 282.09999999999997 l 111.875 285.22499999999997 l 111.875 291.47499999999997 l h f
+141.85000000000002 294.59999999999997 m 147.225 291.47499999999997 l 147.225 285.22499999999997 l 141.85000000000002 282.09999999999997 l 136.47500000000002 285.22499999999997 l 136.47500000000002 291.47499999999997 l h f
+166.45 294.59999999999997 m 171.825 291.47499999999997 l 171.825 285.22499999999997 l 166.45 282.09999999999997 l 161.075 285.22499999999997 l 161.075 291.47499999999997 l h f
+191.05 294.59999999999997 m 196.425 291.47499999999997 l 196.425 285.22499999999997 l 191.05 282.09999999999997 l 185.67499999999998 285.22499999999997 l 185.67499999999998 291.47499999999997 l h f
+215.64999999999998 294.59999999999997 m 221.02499999999998 291.47499999999997 l 221.02499999999998 285.22499999999997 l 215.64999999999998 282.09999999999997 l 210.27499999999998 285.22499999999997 l 210.27499999999998 291.47499999999997 l h f
+240.25 294.59999999999997 m 245.625 291.47499999999997 l 245.625 285.22499999999997 l 240.25 282.09999999999997 l 234.87499999999997 285.22499999999997 l 234.87499999999997 291.47499999999997 l h f
+264.85 294.59999999999997 m 270.225 291.47499999999997 l 270.225 285.22499999999997 l 264.85 282.09999999999997 l 259.47499999999997 285.22499999999997 l 259.47499999999997 291.47499999999997 l h f
+277.15 294.59999999999997 m 282.52500000000003 291.47499999999997 l 282.52500000000003 285.22499999999997 l 277.15 282.09999999999997 l 271.775 285.22499999999997 l 271.775 291.47499999999997 l h f
+289.45 294.59999999999997 m 294.825 291.47499999999997 l 294.825 285.22499999999997 l 289.45 282.09999999999997 l 284.07499999999993 285.22499999999997 l 284.07499999999993 291.47499999999997 l h f
+301.75 294.59999999999997 m 307.125 291.47499999999997 l 307.125 285.22499999999997 l 301.75 282.09999999999997 l 296.37499999999994 285.22499999999997 l 296.37499999999994 291.47499999999997 l h f
+314.04999999999995 294.59999999999997 m 319.425 291.47499999999997 l 319.425 285.22499999999997 l 314.04999999999995 282.09999999999997 l 308.67499999999995 285.22499999999997 l 308.67499999999995 291.47499999999997 l h f
+338.65 294.59999999999997 m 344.025 291.47499999999997 l 344.025 285.22499999999997 l 338.65 282.09999999999997 l 333.275 285.22499999999997 l 333.275 291.47499999999997 l h f
+363.25 294.59999999999997 m 368.62500000000006 291.47499999999997 l 368.62500000000006 285.22499999999997 l 363.25 282.09999999999997 l 357.875 285.22499999999997 l 357.875 291.47499999999997 l h f
+375.55 294.59999999999997 m 380.925 291.47499999999997 l 380.925 285.22499999999997 l 375.55 282.09999999999997 l 370.17499999999995 285.22499999999997 l 370.17499999999995 291.47499999999997 l h f
+387.85 294.59999999999997 m 393.225 291.47499999999997 l 393.225 285.22499999999997 l 387.85 282.09999999999997 l 382.475 285.22499999999997 l 382.475 291.47499999999997 l h f
+283.29999999999995 305.275 m 288.675 302.15 l 288.675 295.9 l 283.29999999999995 292.775 l 277.92499999999995 295.9 l 277.92499999999995 302.15 l h f
+295.59999999999997 305.275 m 300.97499999999997 302.15 l 300.97499999999997 295.9 l 295.59999999999997 292.775 l 290.2249999999999 295.9 l 290.2249999999999 302.15 l h f
+307.9 305.275 m 313.275 302.15 l 313.275 295.9 l 307.9 292.775 l 302.5249999999999 295.9 l 302.5249999999999 302.15 l h f
+320.19999999999993 305.275 m 325.575 302.15 l 325.575 295.9 l 320.19999999999993 292.775 l 314.82499999999993 295.9 l 314.82499999999993 302.15 l h f
+344.79999999999995 305.275 m 350.17499999999995 302.15 l 350.17499999999995 295.9 l 344.79999999999995 292.775 l 339.42499999999995 295.9 l 339.42499999999995 302.15 l h f
+369.40000000000003 305.275 m 374.7750000000001 302.15 l 374.7750000000001 295.9 l 369.40000000000003 292.775 l 364.02500000000003 295.9 l 364.02500000000003 302.15 l h f
+381.70000000000005 305.275 m 387.07500000000005 302.15 l 387.07500000000005 295.9 l 381.70000000000005 292.775 l 376.325 295.9 l 376.325 302.15 l h f
+31.15 315.94999999999993 m 36.525 312.82499999999993 l 36.525 306.57499999999993 l 31.15 303.44999999999993 l 25.775 306.57499999999993 l 25.775 312.82499999999993 l h f
+55.75 315.94999999999993 m 61.125 312.82499999999993 l 61.125 306.57499999999993 l 55.75 303.44999999999993 l 50.375 306.57499999999993 l 50.375 312.82499999999993 l h f
+80.35 315.94999999999993 m 85.725 312.82499999999993 l 85.725 306.57499999999993 l 80.35 303.44999999999993 l 74.97500000000001 306.57499999999993 l 74.97500000000001 312.82499999999993 l h f
+104.95 315.94999999999993 m 110.325 312.82499999999993 l 110.325 306.57499999999993 l 104.95 303.44999999999993 l 99.575 306.57499999999993 l 99.575 312.82499999999993 l h f
+129.55 315.94999999999993 m 134.925 312.82499999999993 l 134.925 306.57499999999993 l 129.55 303.44999999999993 l 124.17500000000001 306.57499999999993 l 124.17500000000001 312.82499999999993 l h f
+154.15 315.94999999999993 m 159.525 312.82499999999993 l 159.525 306.57499999999993 l 154.15 303.44999999999993 l 148.775 306.57499999999993 l 148.775 312.82499999999993 l h f
+178.75 315.94999999999993 m 184.125 312.82499999999993 l 184.125 306.57499999999993 l 178.75 303.44999999999993 l 173.375 306.57499999999993 l 173.375 312.82499999999993 l h f
+203.34999999999997 315.94999999999993 m 208.725 312.82499999999993 l 208.725 306.57499999999993 l 203.34999999999997 303.44999999999993 l 197.97499999999997 306.57499999999993 l 197.97499999999997 312.82499999999993 l h f
+227.95 315.94999999999993 m 233.325 312.82499999999993 l 233.325 306.57499999999993 l 227.95 303.44999999999993 l 222.57499999999996 306.57499999999993 l 222.57499999999996 312.82499999999993 l h f
+252.54999999999998 315.94999999999993 m 257.925 312.82499999999993 l 257.925 306.57499999999993 l 252.54999999999998 303.44999999999993 l 247.17499999999998 306.57499999999993 l 247.17499999999998 312.82499999999993 l h f
+375.55 315.94999999999993 m 380.925 312.82499999999993 l 380.925 306.57499999999993 l 375.55 303.44999999999993 l 370.17499999999995 306.57499999999993 l 370.17499999999995 312.82499999999993 l h f
+37.3 326.625 m 42.675 323.5 l 42.675 317.25 l 37.3 314.125 l 31.925 317.25 l 31.925 323.5 l h f
+49.6 326.625 m 54.975 323.5 l 54.975 317.25 l 49.6 314.125 l 44.224999999999994 317.25 l 44.224999999999994 323.5 l h f
+61.900000000000006 326.625 m 67.275 323.5 l 67.275 317.25 l 61.900000000000006 314.125 l 56.525000000000006 317.25 l 56.525000000000006 323.5 l h f
+74.2 326.625 m 79.57499999999999 323.5 l 79.57499999999999 317.25 l 74.2 314.125 l 68.825 317.25 l 68.825 323.5 l h f
+86.5 326.625 m 91.875 323.5 l 91.875 317.25 l 86.5 314.125 l 81.125 317.25 l 81.125 323.5 l h f
+98.80000000000001 326.625 m 104.17500000000001 323.5 l 104.17500000000001 317.25 l 98.80000000000001 314.125 l 93.42500000000001 317.25 l 93.42500000000001 323.5 l h f
+111.1 326.625 m 116.475 323.5 l 116.475 317.25 l 111.1 314.125 l 105.725 317.25 l 105.725 323.5 l h f
+123.4 326.625 m 128.77499999999998 323.5 l 128.77499999999998 317.25 l 123.4 314.125 l 118.025 317.25 l 118.025 323.5 l h f
+184.9 326.625 m 190.275 323.5 l 190.275 317.25 l 184.9 314.125 l 179.525 317.25 l 179.525 323.5 l h f
+197.2 326.625 m 202.575 323.5 l 202.575 317.25 l 197.2 314.125 l 191.825 317.25 l 191.825 323.5 l h f
+209.49999999999994 326.625 m 214.87499999999997 323.5 l 214.87499999999997 317.25 l 209.49999999999994 314.125 l 204.12499999999994 317.25 l 204.12499999999994 323.5 l h f
+221.79999999999995 326.625 m 227.17499999999998 323.5 l 227.17499999999998 317.25 l 221.79999999999995 314.125 l 216.42499999999995 317.25 l 216.42499999999995 323.5 l h f
+295.59999999999997 326.625 m 300.97499999999997 323.5 l 300.97499999999997 317.25 l 295.59999999999997 314.125 l 290.2249999999999 317.25 l 290.2249999999999 323.5 l h f
+320.19999999999993 326.625 m 325.575 323.5 l 325.575 317.25 l 320.19999999999993 314.125 l 314.82499999999993 317.25 l 314.82499999999993 323.5 l h f
+43.45 337.29999999999995 m 48.825 334.17499999999995 l 48.825 327.92499999999995 l 43.45 324.79999999999995 l 38.075 327.92499999999995 l 38.075 334.17499999999995 l h f
+68.05 337.29999999999995 m 73.425 334.17499999999995 l 73.425 327.92499999999995 l 68.05 324.79999999999995 l 62.675 327.92499999999995 l 62.675 334.17499999999995 l h f
+80.35 337.29999999999995 m 85.725 334.17499999999995 l 85.725 327.92499999999995 l 80.35 324.79999999999995 l 74.97500000000001 327.92499999999995 l 74.97500000000001 334.17499999999995 l h f
+104.95 337.29999999999995 m 110.325 334.17499999999995 l 110.325 327.92499999999995 l 104.95 324.79999999999995 l 99.575 327.92499999999995 l 99.575 334.17499999999995 l h f
+129.55 337.29999999999995 m 134.925 334.17499999999995 l 134.925 327.92499999999995 l 129.55 324.79999999999995 l 124.17500000000001 327.92499999999995 l 124.17500000000001 334.17499999999995 l h f
+141.85000000000002 337.29999999999995 m 147.225 334.17499999999995 l 147.225 327.92499999999995 l 141.85000000000002 324.79999999999995 l 136.47500000000002 327.92499999999995 l 136.47500000000002 334.17499999999995 l h f
+154.15 337.29999999999995 m 159.525 334.17499999999995 l 159.525 327.92499999999995 l 154.15 324.79999999999995 l 148.775 327.92499999999995 l 148.775 334.17499999999995 l h f
+166.45 337.29999999999995 m 171.825 334.17499999999995 l 171.825 327.92499999999995 l 166.45 324.79999999999995 l 161.075 327.92499999999995 l 161.075 334.17499999999995 l h f
+227.95 337.29999999999995 m 233.325 334.17499999999995 l 233.325 327.92499999999995 l 227.95 324.79999999999995 l 222.57499999999996 327.92499999999995 l 222.57499999999996 334.17499999999995 l h f
+240.25 337.29999999999995 m 245.625 334.17499999999995 l 245.625 327.92499999999995 l 240.25 324.79999999999995 l 234.87499999999997 327.92499999999995 l 234.87499999999997 334.17499999999995 l h f
+252.54999999999998 337.29999999999995 m 257.925 334.17499999999995 l 257.925 327.92499999999995 l 252.54999999999998 324.79999999999995 l 247.17499999999998 327.92499999999995 l 247.17499999999998 334.17499999999995 l h f
+264.85 337.29999999999995 m 270.225 334.17499999999995 l 270.225 327.92499999999995 l 264.85 324.79999999999995 l 259.47499999999997 327.92499999999995 l 259.47499999999997 334.17499999999995 l h f
+289.45 337.29999999999995 m 294.825 334.17499999999995 l 294.825 327.92499999999995 l 289.45 324.79999999999995 l 284.07499999999993 327.92499999999995 l 284.07499999999993 334.17499999999995 l h f
+314.04999999999995 337.29999999999995 m 319.425 334.17499999999995 l 319.425 327.92499999999995 l 314.04999999999995 324.79999999999995 l 308.67499999999995 327.92499999999995 l 308.67499999999995 334.17499999999995 l h f
+338.65 337.29999999999995 m 344.025 334.17499999999995 l 344.025 327.92499999999995 l 338.65 324.79999999999995 l 333.275 327.92499999999995 l 333.275 334.17499999999995 l h f
+363.25 337.29999999999995 m 368.62500000000006 334.17499999999995 l 368.62500000000006 327.92499999999995 l 363.25 324.79999999999995 l 357.875 327.92499999999995 l 357.875 334.17499999999995 l h f
+37.3 347.975 m 42.675 344.84999999999997 l 42.675 338.59999999999997 l 37.3 335.47499999999997 l 31.925 338.59999999999997 l 31.925 344.84999999999997 l h f
+61.900000000000006 347.975 m 67.275 344.84999999999997 l 67.275 338.59999999999997 l 61.900000000000006 335.47499999999997 l 56.525000000000006 338.59999999999997 l 56.525000000000006 344.84999999999997 l h f
+86.5 347.975 m 91.875 344.84999999999997 l 91.875 338.59999999999997 l 86.5 335.47499999999997 l 81.125 338.59999999999997 l 81.125 344.84999999999997 l h f
+111.1 347.975 m 116.475 344.84999999999997 l 116.475 338.59999999999997 l 111.1 335.47499999999997 l 105.725 338.59999999999997 l 105.725 344.84999999999997 l h f
+197.2 347.975 m 202.575 344.84999999999997 l 202.575 338.59999999999997 l 197.2 335.47499999999997 l 191.825 338.59999999999997 l 191.825 344.84999999999997 l h f
+221.79999999999995 347.975 m 227.17499999999998 344.84999999999997 l 227.17499999999998 338.59999999999997 l 221.79999999999995 335.47499999999997 l 216.42499999999995 338.59999999999997 l 216.42499999999995 344.84999999999997 l h f
+246.39999999999998 347.975 m 251.77499999999998 344.84999999999997 l 251.77499999999998 338.59999999999997 l 246.39999999999998 335.47499999999997 l 241.02499999999995 338.59999999999997 l 241.02499999999995 344.84999999999997 l h f
+271 347.975 m 276.375 344.84999999999997 l 276.375 338.59999999999997 l 271 335.47499999999997 l 265.625 338.59999999999997 l 265.625 344.84999999999997 l h f
+283.29999999999995 347.975 m 288.675 344.84999999999997 l 288.675 338.59999999999997 l 283.29999999999995 335.47499999999997 l 277.92499999999995 338.59999999999997 l 277.92499999999995 344.84999999999997 l h f
+295.59999999999997 347.975 m 300.97499999999997 344.84999999999997 l 300.97499999999997 338.59999999999997 l 295.59999999999997 335.47499999999997 l 290.2249999999999 338.59999999999997 l 290.2249999999999 344.84999999999997 l h f
+307.9 347.975 m 313.275 344.84999999999997 l 313.275 338.59999999999997 l 307.9 335.47499999999997 l 302.5249999999999 338.59999999999997 l 302.5249999999999 344.84999999999997 l h f
+320.19999999999993 347.975 m 325.575 344.84999999999997 l 325.575 338.59999999999997 l 320.19999999999993 335.47499999999997 l 314.82499999999993 338.59999999999997 l 314.82499999999993 344.84999999999997 l h f
+332.49999999999994 347.975 m 337.875 344.84999999999997 l 337.875 338.59999999999997 l 332.49999999999994 335.47499999999997 l 327.12499999999994 338.59999999999997 l 327.12499999999994 344.84999999999997 l h f
+357.1 347.975 m 362.475 344.84999999999997 l 362.475 338.59999999999997 l 357.1 335.47499999999997 l 351.725 338.59999999999997 l 351.725 344.84999999999997 l h f
+381.70000000000005 347.975 m 387.07500000000005 344.84999999999997 l 387.07500000000005 338.59999999999997 l 381.70000000000005 335.47499999999997 l 376.325 338.59999999999997 l 376.325 344.84999999999997 l h f
+31.15 358.65000000000003 m 36.525 355.52500000000003 l 36.525 349.27500000000003 l 31.15 346.15000000000003 l 25.775 349.27500000000003 l 25.775 355.52500000000003 l h f
+43.45 358.65000000000003 m 48.825 355.52500000000003 l 48.825 349.27500000000003 l 43.45 346.15000000000003 l 38.075 349.27500000000003 l 38.075 355.52500000000003 l h f
+55.75 358.65000000000003 m 61.125 355.52500000000003 l 61.125 349.27500000000003 l 55.75 346.15000000000003 l 50.375 349.27500000000003 l 50.375 355.52500000000003 l h f
+68.05 358.65000000000003 m 73.425 355.52500000000003 l 73.425 349.27500000000003 l 68.05 346.15000000000003 l 62.675 349.27500000000003 l 62.675 355.52500000000003 l h f
+92.65 358.65000000000003 m 98.025 355.52500000000003 l 98.025 349.27500000000003 l 92.65 346.15000000000003 l 87.275 349.27500000000003 l 87.275 355.52500000000003 l h f
+117.25 358.65000000000003 m 122.625 355.52500000000003 l 122.625 349.27500000000003 l 117.25 346.15000000000003 l 111.875 349.27500000000003 l 111.875 355.52500000000003 l h f
+129.55 358.65000000000003 m 134.925 355.52500000000003 l 134.925 349.27500000000003 l 129.55 346.15000000000003 l 124.17500000000001 349.27500000000003 l 124.17500000000001 355.52500000000003 l h f
+154.15 358.65000000000003 m 159.525 355.52500000000003 l 159.525 349.27500000000003 l 154.15 346.15000000000003 l 148.775 349.27500000000003 l 148.775 355.52500000000003 l h f
+227.95 358.65000000000003 m 233.325 355.52500000000003 l 233.325 349.27500000000003 l 227.95 346.15000000000003 l 222.57499999999996 349.27500000000003 l 222.57499999999996 355.52500000000003 l h f
+240.25 358.65000000000003 m 245.625 355.52500000000003 l 245.625 349.27500000000003 l 240.25 346.15000000000003 l 234.87499999999997 349.27500000000003 l 234.87499999999997 355.52500000000003 l h f
+252.54999999999998 358.65000000000003 m 257.925 355.52500000000003 l 257.925 349.27500000000003 l 252.54999999999998 346.15000000000003 l 247.17499999999998 349.27500000000003 l 247.17499999999998 355.52500000000003 l h f
+264.85 358.65000000000003 m 270.225 355.52500000000003 l 270.225 349.27500000000003 l 264.85 346.15000000000003 l 259.47499999999997 349.27500000000003 l 259.47499999999997 355.52500000000003 l h f
+289.45 358.65000000000003 m 294.825 355.52500000000003 l 294.825 349.27500000000003 l 289.45 346.15000000000003 l 284.07499999999993 349.27500000000003 l 284.07499999999993 355.52500000000003 l h f
+314.04999999999995 358.65000000000003 m 319.425 355.52500000000003 l 319.425 349.27500000000003 l 314.04999999999995 346.15000000000003 l 308.67499999999995 349.27500000000003 l 308.67499999999995 355.52500000000003 l h f
+326.34999999999997 358.65000000000003 m 331.725 355.52500000000003 l 331.725 349.27500000000003 l 326.34999999999997 346.15000000000003 l 320.97499999999997 349.27500000000003 l 320.97499999999997 355.52500000000003 l h f
+350.95 358.65000000000003 m 356.325 355.52500000000003 l 356.325 349.27500000000003 l 350.95 346.15000000000003 l 345.575 349.27500000000003 l 345.575 355.52500000000003 l h f
+375.55 358.65000000000003 m 380.925 355.52500000000003 l 380.925 349.27500000000003 l 375.55 346.15000000000003 l 370.17499999999995 349.27500000000003 l 370.17499999999995 355.52500000000003 l h f
+49.6 369.325 m 54.975 366.2 l 54.975 359.95 l 49.6 356.825 l 44.224999999999994 359.95 l 44.224999999999994 366.2 l h f
+74.2 369.325 m 79.57499999999999 366.2 l 79.57499999999999 359.95 l 74.2 356.825 l 68.825 359.95 l 68.825 366.2 l h f
+86.5 369.325 m 91.875 366.2 l 91.875 359.95 l 86.5 356.825 l 81.125 359.95 l 81.125 366.2 l h f
+111.1 369.325 m 116.475 366.2 l 116.475 359.95 l 111.1 356.825 l 105.725 359.95 l 105.725 366.2 l h f
+135.7 369.325 m 141.075 366.2 l 141.075 359.95 l 135.7 356.825 l 130.325 359.95 l 130.325 366.2 l h f
+148 369.325 m 153.375 366.2 l 153.375 359.95 l 148 356.825 l 142.625 359.95 l 142.625 366.2 l h f
+160.3 369.325 m 165.675 366.2 l 165.675 359.95 l 160.3 356.825 l 154.925 359.95 l 154.925 366.2 l h f
+172.6 369.325 m 177.975 366.2 l 177.975 359.95 l 172.6 356.825 l 167.225 359.95 l 167.225 366.2 l h f
+197.2 369.325 m 202.575 366.2 l 202.575 359.95 l 197.2 356.825 l 191.825 359.95 l 191.825 366.2 l h f
+221.79999999999995 369.325 m 227.17499999999998 366.2 l 227.17499999999998 359.95 l 221.79999999999995 356.825 l 216.42499999999995 359.95 l 216.42499999999995 366.2 l h f
+234.09999999999997 369.325 m 239.47499999999997 366.2 l 239.47499999999997 359.95 l 234.09999999999997 356.825 l 228.72499999999997 359.95 l 228.72499999999997 366.2 l h f
+258.7 369.325 m 264.075 366.2 l 264.075 359.95 l 258.7 356.825 l 253.32499999999996 359.95 l 253.32499999999996 366.2 l h f
+283.29999999999995 369.325 m 288.675 366.2 l 288.675 359.95 l 283.29999999999995 356.825 l 277.92499999999995 359.95 l 277.92499999999995 366.2 l h f
+307.9 369.325 m 313.275 366.2 l 313.275 359.95 l 307.9 356.825 l 302.5249999999999 359.95 l 302.5249999999999 366.2 l h f
+332.49999999999994 369.325 m 337.875 366.2 l 337.875 359.95 l 332.49999999999994 356.825 l 327.12499999999994 359.95 l 327.12499999999994 366.2 l h f
+344.79999999999995 369.325 m 350.17499999999995 366.2 l 350.17499999999995 359.95 l 344.79999999999995 356.825 l 339.42499999999995 359.95 l 339.42499999999995 366.2 l h f
+357.1 369.325 m 362.475 366.2 l 362.475 359.95 l 357.1 356.825 l 351.725 359.95 l 351.725 366.2 l h f
+369.40000000000003 369.325 m 374.7750000000001 366.2 l 374.7750000000001 359.95 l 369.40000000000003 356.825 l 364.02500000000003 359.95 l 364.02500000000003 366.2 l h f
+43.45 380 m 48.825 376.875 l 48.825 370.625 l 43.45 367.5 l 38.075 370.625 l 38.075 376.875 l h f
+68.05 380 m 73.425 376.875 l 73.425 370.625 l 68.05 367.5 l 62.675 370.625 l 62.675 376.875 l h f
+191.05 380 m 196.425 376.875 l 196.425 370.625 l 191.05 367.5 l 185.67499999999998 370.625 l 185.67499999999998 376.875 l h f
+215.64999999999998 380 m 221.02499999999998 376.875 l 221.02499999999998 370.625 l 215.64999999999998 367.5 l 210.27499999999998 370.625 l 210.27499999999998 376.875 l h f
+227.95 380 m 233.325 376.875 l 233.325 370.625 l 227.95 367.5 l 222.57499999999996 370.625 l 222.57499999999996 376.875 l h f
+252.54999999999998 380 m 257.925 376.875 l 257.925 370.625 l 252.54999999999998 367.5 l 247.17499999999998 370.625 l 247.17499999999998 376.875 l h f
+277.15 380 m 282.52500000000003 376.875 l 282.52500000000003 370.625 l 277.15 367.5 l 271.775 370.625 l 271.775 376.875 l h f
+301.75 380 m 307.125 376.875 l 307.125 370.625 l 301.75 367.5 l 296.37499999999994 370.625 l 296.37499999999994 376.875 l h f
+338.65 380 m 344.025 376.875 l 344.025 370.625 l 338.65 367.5 l 333.275 370.625 l 333.275 376.875 l h f
+363.25 380 m 368.62500000000006 376.875 l 368.62500000000006 370.625 l 363.25 367.5 l 357.875 370.625 l 357.875 376.875 l h f
+258.05 203 m 258.05 232.96144767832055 233.7614476783205 257.25 203.79999999999998 257.25 c 173.83855232167946 257.25 149.54999999999998 232.96144767832055 149.54999999999998 203 c 149.54999999999998 173.03855232167948 173.83855232167946 148.75 203.79999999999998 148.75 c 233.7614476783205 148.75 258.05 173.03855232167948 258.05 203 c h f
+Q
+q
+0 J
+
+/Fnt0 12.0 Tf
+248.64999999999998 203 m 248.64999999999998 227.76997102991106 228.56997102991107 247.85 203.79999999999998 247.85 c 179.0300289700889 247.85 158.95 227.76997102991106 158.95 203 c 158.95 178.2300289700889 179.0300289700889 158.15 203.79999999999998 158.15 c 228.56997102991107 158.15 248.64999999999998 178.2300289700889 248.64999999999998 203 c h f
+Q
+q
+0 0 0 rg 0 0 0 RG
+0 J
+
+/Fnt0 12.0 Tf
+239.3 203 m 239.3 222.60610861899318 223.40610861899316 238.5 203.79999999999998 238.5 c 184.19389138100684 238.5 168.29999999999998 222.60610861899318 168.29999999999998 203 c 168.29999999999998 183.39389138100685 184.19389138100684 167.5 203.79999999999998 167.5 c 223.40610861899316 167.5 239.3 183.39389138100685 239.3 203 c h f
+Q
+q
+0 J
+
+/Fnt0 12.0 Tf
+229.89999999999998 203 m 229.89999999999998 217.41463197058368 218.2146319705837 229.1 203.79999999999998 229.1 c 189.38536802941627 229.1 177.7 217.41463197058368 177.7 203 c 177.7 188.5853680294163 189.38536802941627 176.9 203.79999999999998 176.9 c 218.2146319705837 176.9 229.89999999999998 188.5853680294163 229.89999999999998 203 c h f
+Q
+q
+0 0 0 rg 0 0 0 RG
+0 J
+
+/Fnt0 12.0 Tf
+220.35 203 m 220.35 212.14031260969963 212.94031260969962 219.55 203.79999999999998 219.55 c 194.65968739030035 219.55 187.24999999999997 212.14031260969963 187.24999999999997 203 c 187.24999999999997 193.85968739030037 194.65968739030035 186.45 203.79999999999998 186.45 c 212.94031260969962 186.45 220.35 193.85968739030037 220.35 203 c h f
+Q
+q
+0 J
+
+/Fnt0 12.0 Tf
+210.95 203.00000000000003 m 210.95 206.9488359612902 207.74883596129015 210.15000000000003 203.79999999999998 210.15000000000003 c 199.8511640387098 210.15000000000003 196.64999999999998 206.9488359612902 196.64999999999998 203.00000000000003 c 196.64999999999998 199.05116403870986 199.8511640387098 195.85000000000002 203.79999999999998 195.85000000000002 c 207.74883596129015 195.85000000000002 210.95 199.05116403870986 210.95 203.00000000000003 c h f
+Q
+Q
+endstream
+endobj
+5 0 obj
+64455
+endobj
+6 0 obj
+<<
+/ProcSet [/PDF /Text /ImageB /ImageC /ImageI]
+/Font <<
+/Fnt0 <<
+/Type /Font
+/Subtype /TrueType
+/Encoding /WinAnsiEncoding
+/BaseFont /DejaVuSans
+>>
+>>
+>>
+endobj
+xref
+0 7
+0000000000 65535 f 
+0000000009 00000 n 
+0000000058 00000 n 
+0000000115 00000 n 
+0000000248 00000 n 
+0000064755 00000 n 
+0000064776 00000 n 
+trailer
+<<
+/Size 7
+/Root 1 0 R
+>>
+startxref
+64947
+%%EOF

barcode/src/test/resources/org/xbib/graphics/barcode/output/maxicode-basic.svg

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" height="28.92777440287076mm" version="1.1" viewBox="0.0 0.0 84.0 82.0" width="29.633329876111514mm" x="0mm" y="0mm" xmlns="http://www.w3.org/2000/svg">
-  <rect height="1200" style="fill:rgb(255,255,255);stroke:none;" width="1920" x="0" y="0"/>
+  <rect height="82" style="fill:rgb(255,255,255);stroke:none;" width="84" x="0" y="0"/>
   <path d="M8.69,7.68 L9.765,7.055 L9.765,5.805 L8.69,5.18 L7.615,5.805 L7.615,7.055 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M13.61,7.68 L14.684999999999999,7.055 L14.684999999999999,5.805 L13.61,5.18 L12.535,5.805 L12.535,7.055 Z" style="fill:rgb(0,0,0);stroke:none;"/>
   <path d="M18.53,7.68 L19.605,7.055 L19.605,5.805 L18.53,5.18 L17.455000000000002,5.805 L17.455000000000002,7.055 Z" style="fill:rgb(0,0,0);stroke:none;"/>

build.gradle

@@ -19,8 +19,8 @@ ext {
     scmDeveloperConnection = 'scm:git:ssh://git@github.com:' + user + '/' + name + '.git'
     issueManagementSystem = 'Github'
     issueManagementUrl = ext.scmUrl + '/issues'
-    licenseName = 'The Apache License, Version 2.0'
+    licenseName = 'The GNU General Public License, Version 3'
-    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    licenseUrl = 'https://www.gnu.org/licenses/gpl-3.0.txt'
 }
 
 subprojects {

chart/src/main/java/org/xbib/graphics/chart/Chart.java

@@ -15,6 +15,7 @@ import org.xbib.graphics.io.vector.pdf.PDFGraphics2D;
 import org.xbib.graphics.io.vector.svg.SVGGraphics2D;
 
 import java.awt.Graphics2D;
+import java.awt.Rectangle;
 import java.awt.RenderingHints;
 import java.awt.Shape;
 import java.awt.geom.AffineTransform;
@@ -371,13 +372,13 @@ public abstract class Chart<ST extends Styler, S extends Series> {
         VectorGraphics2D g = null;
         switch (vectorGraphicsFormat) {
             case EPS:
-                g = new EPSGraphics2D(0.0, 0.0, getWidth(), getHeight());
+                g = new EPSGraphics2D(new Rectangle(0, 0, getWidth(), getHeight()));
                 break;
             case PDF:
-                g = new PDFGraphics2D(0.0, 0.0, getWidth(), getHeight());
+                g = new PDFGraphics2D(new Rectangle(0, 0, getWidth(), getHeight()));
                 break;
             case SVG:
-                g = new SVGGraphics2D(0.0, 0.0, getWidth(), getHeight());
+                g = new SVGGraphics2D(new Rectangle(0, 0, getWidth(), getHeight()));
                 break;
 
             default:

io-vector-eps/src/main/java/org/xbib/graphics/io/vector/eps/EPSGraphics2D.java

@@ -4,6 +4,7 @@ import org.xbib.graphics.io.vector.PageSize;
 import org.xbib.graphics.io.vector.VectorGraphics2D;
 import java.awt.BasicStroke;
 import java.awt.Color;
+import java.awt.Rectangle;
 
 /**
  * {@code Graphics2D} implementation that saves all operations to a string
@@ -11,18 +12,8 @@ import java.awt.Color;
  */
 public class EPSGraphics2D extends VectorGraphics2D {
 
-    /**
+    public EPSGraphics2D(Rectangle rectangle) {
-     * Initializes a new VectorGraphics2D pipeline for translating Graphics2D
+        super(new EPSProcessor(), new PageSize(rectangle));
-     * commands to EPS data. The document dimensions must be specified as
-     * parameters.
-     *
-     * @param x      Left offset.
-     * @param y      Top offset
-     * @param width  Width.
-     * @param height Height.
-     */
-    public EPSGraphics2D(double x, double y, double width, double height) {
-        super(new EPSProcessor(), new PageSize(x, y, width, height));
         /*
          * The following are the default settings for the graphics state in an EPS file.
 		 * Although they currently appear in the document output, they do not have to be set explicitly.

io-vector-eps/src/main/java/org/xbib/graphics/io/vector/eps/EPSGraphics2DProvider.java

@@ -2,6 +2,8 @@ package org.xbib.graphics.io.vector.eps;
 
 import org.xbib.graphics.io.vector.VectorGraphics2DProvider;
 
+import java.awt.Rectangle;
+
 public class EPSGraphics2DProvider implements VectorGraphics2DProvider<EPSGraphics2D> {
     @Override
     public String name() {
@@ -9,7 +11,7 @@ public class EPSGraphics2DProvider implements VectorGraphics2DProvider<EPSGraphi
     }
 
     @Override
-    public EPSGraphics2D provide(double x, double y, double width, double height) {
+    public EPSGraphics2D provide(Rectangle rectangle) {
-        return new EPSGraphics2D(x, y, width, height);
+        return new EPSGraphics2D(rectangle);
     }
 }

io-vector-pdf/src/main/java/org/xbib/graphics/io/vector/pdf/PDFGraphics2D.java

@@ -4,6 +4,7 @@ import org.xbib.graphics.io.vector.VectorGraphics2D;
 import org.xbib.graphics.io.vector.PageSize;
 import java.awt.BasicStroke;
 import java.awt.Color;
+import java.awt.Rectangle;
 
 /**
  * {@code Graphics2D} implementation that saves all operations to a string
@@ -11,19 +12,8 @@ import java.awt.Color;
  */
 public class PDFGraphics2D extends VectorGraphics2D {
 
-    /**
+    public PDFGraphics2D(Rectangle rectangle) {
-     * Initializes a new VectorGraphics2D pipeline for translating Graphics2D
+        super(new PDFProcessor(), new PageSize(rectangle));
-     * commands to PDF data. The document dimensions must be specified as
-     * parameters.
-     *
-     * @param x      Left offset.
-     * @param y      Top offset
-     * @param width  Width.
-     * @param height Height.
-     */
-    public PDFGraphics2D(double x, double y, double width, double height) {
-        super(new PDFProcessor(), new PageSize(x, y, width, height));
-        // TODO: Default graphics state does not need to be printed in the document
         setColor(Color.BLACK);
         setStroke(new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10f, null, 0f));
     }

io-vector-pdf/src/main/java/org/xbib/graphics/io/vector/pdf/PDFGraphics2DProvider.java

@@ -2,14 +2,17 @@ package org.xbib.graphics.io.vector.pdf;
 
 import org.xbib.graphics.io.vector.VectorGraphics2DProvider;
 
+import java.awt.Rectangle;
+
 public class PDFGraphics2DProvider implements VectorGraphics2DProvider<PDFGraphics2D> {
+
     @Override
     public String name() {
         return "pdf";
     }
 
     @Override
-    public PDFGraphics2D provide(double x, double y, double width, double height) {
+    public PDFGraphics2D provide(Rectangle rectangle) {
-        return new PDFGraphics2D(x, y, width, height);
+        return new PDFGraphics2D(rectangle);
     }
 }

io-vector-pdf/src/main/java/org/xbib/graphics/io/vector/pdf/PDFProcessorResult.java

@@ -36,6 +36,7 @@ import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.HeadlessException;
 import java.awt.Image;
+import java.awt.Rectangle;
 import java.awt.Shape;
 import java.awt.Stroke;
 import java.awt.Transparency;

io-vector-pdf/src/main/java/org/xbib/graphics/io/vector/pdf/util/Resources.java

@@ -74,11 +74,12 @@ public class Resources extends PDFObject {
         String resourceId = getResourceId(fonts, font, PREFIX_FONT, currentFontId);
         String fontName = font.getPSName();
         String fontEncoding = "WinAnsiEncoding";
-        dictEntry.put(resourceId, Map.of("Type", "Font",
+        Map<String, Object> map = new LinkedHashMap<>();
-                "Subtype", "TrueType",
+        map.put("Type", "Font");
-                "Encoding", fontEncoding,
+        map.put("Subtype", "TrueType");
-                "BaseFont", fontName
+        map.put("Encoding", fontEncoding);
-                ));
+        map.put("BaseFont", fontName);
+        dictEntry.put(resourceId,map);
         return resourceId;
     }
 
@@ -102,11 +103,12 @@ public class Resources extends PDFObject {
             dictEntry = new LinkedHashMap<>();
             dict.put(KEY_TRANSPARENCY, dictEntry);
         }
-        String resourceId = getResourceId(transparencies, transparency,
+        String resourceId = getResourceId(transparencies, transparency, PREFIX_TRANSPARENCY, currentTransparencyId);
-                PREFIX_TRANSPARENCY, currentTransparencyId);
+        Map<String, Object> map = new LinkedHashMap<>();
-        dictEntry.put(resourceId, Map.of("Type", "ExtGState",
+        map.put("Type", "ExtGState");
-                "ca", transparency,
+        map.put("ca", transparency);
-                "CA", transparency));
+        map.put( "CA", transparency);
+        dictEntry.put(resourceId, map);
         return resourceId;
     }
 
@@ -119,7 +121,7 @@ public class Resources extends PDFObject {
      * @return An object of the first matching physical font. The original font
      * object is returned if it was a physical font or no font matched.
      */
-    public static Font getPhysicalFont(Font logicalFont, String testText) {
+    private static Font getPhysicalFont(Font logicalFont, String testText) {
         String logicalFamily = logicalFont.getFamily();
         if (!isLogicalFontFamily(logicalFamily)) {
             return logicalFont;
@@ -149,7 +151,7 @@ public class Resources extends PDFObject {
         return physicalFonts.poll();
     }
 
-    public static Font getPhysicalFont(Font logicalFont) {
+    private static Font getPhysicalFont(Font logicalFont) {
         return getPhysicalFont(logicalFont, FONT_TEST_STRING);
     }
 

io-vector-svg/src/main/java/org/xbib/graphics/io/vector/svg/SVGGraphics2D.java

@@ -3,6 +3,7 @@ package org.xbib.graphics.io.vector.svg;
 import org.xbib.graphics.io.vector.VectorGraphics2D;
 import org.xbib.graphics.io.vector.PageSize;
 import java.awt.Color;
+import java.awt.Rectangle;
 
 /**
  * {@code Graphics2D} implementation that saves all operations to a string
@@ -10,18 +11,8 @@ import java.awt.Color;
  */
 public class SVGGraphics2D extends VectorGraphics2D {
 
-    /**
+    public SVGGraphics2D(Rectangle rectangle) {
-     * Initializes a new VectorGraphics2D pipeline for translating Graphics2D
+        super(new SVGProcessor(), new PageSize(rectangle));
-     * commands to SVG data. The document dimensions must be specified as
-     * parameters.
-     *
-     * @param x      Left offset.
-     * @param y      Top offset
-     * @param width  Width.
-     * @param height Height.
-     */
-    public SVGGraphics2D(double x, double y, double width, double height) {
-        super(new SVGProcessor(), new PageSize(x, y, width, height));
         setColor(Color.BLACK);
     }
 }

io-vector-svg/src/main/java/org/xbib/graphics/io/vector/svg/SVGGraphics2DProvider.java

@@ -2,14 +2,17 @@ package org.xbib.graphics.io.vector.svg;
 
 import org.xbib.graphics.io.vector.VectorGraphics2DProvider;
 
+import java.awt.Rectangle;
+
 public class SVGGraphics2DProvider implements VectorGraphics2DProvider<SVGGraphics2D> {
+
     @Override
     public String name() {
         return "eps";
     }
 
     @Override
-    public SVGGraphics2D provide(double x, double y, double width, double height) {
+    public SVGGraphics2D provide(Rectangle rectangle) {
-        return new SVGGraphics2D(x, y, width, height);
+        return new SVGGraphics2D(rectangle);
     }
 }

io-vector/src/main/java/org/xbib/graphics/io/vector/PageSize.java

@@ -1,6 +1,6 @@
 package org.xbib.graphics.io.vector;
 
-import java.awt.geom.Rectangle2D;
+import java.awt.Rectangle;
 
 public class PageSize {
 
@@ -39,8 +39,8 @@ public class PageSize {
         this(0.0, 0.0, width, height);
     }
 
-    public PageSize(Rectangle2D size) {
+    public PageSize(Rectangle rectangle) {
-        this(size.getX(), size.getY(), size.getWidth(), size.getHeight());
+        this(rectangle.getX(), rectangle.getY(), rectangle.getWidth(), rectangle.getHeight());
     }
 
     public PageSize getPortrait() {

io-vector/src/main/java/org/xbib/graphics/io/vector/VectorGraphics2DProvider.java

@@ -1,8 +1,10 @@
 package org.xbib.graphics.io.vector;
 
+import java.awt.Rectangle;
+
 public interface VectorGraphics2DProvider<V extends VectorGraphics2D> {
 
     String name();
 
-    V provide(double x, double y, double width, double height);
+    V provide(Rectangle rectangle);
 }

png/src/main/java/module-info.java

@@ -3,5 +3,5 @@ module org.xbib.graphics.png {
     exports org.xbib.graphics.imageio.plugins.png.pngj;
     exports org.xbib.graphics.imageio.plugins.png.pngj.chunks;
     exports org.xbib.graphics.imageio.plugins.png.pngj.pixels;
-    requires java.desktop;
+    requires transitive java.desktop;
 }

png/src/main/java/org/xbib/graphics/imageio/plugins/png/ScanlineCursor.java

@@ -6,7 +6,7 @@ import java.awt.image.Raster;
 /**
  * A helper class that supports the scanline provider in navigating the structure of a Java image.
  */
-final class ScanlineCursor {
+public final class ScanlineCursor {
 
     final int scanlineStride;
 

png/src/main/java/org/xbib/graphics/imageio/plugins/png/pngj/ChunkReader.java

@@ -6,12 +6,6 @@ import org.xbib.graphics.imageio.plugins.png.pngj.chunks.ChunkRaw;
  * Parses a PNG chunk, consuming bytes in one of three modes:
  * {@link ChunkReaderMode#BUFFER}, {@link ChunkReaderMode#PROCESS},
  * {@link ChunkReaderMode#SKIP}.
- * <p>
- * It calls {@link #chunkDone()} when done. Also calls
- * {@link #processData(byte[], int, int)} if <code>PROCESS</code> mode. Apart
- * from thas, it's totally agnostic (it doesn't know about IDAT chunks, or PNG
- * general structure)
- * <p>
  * The object wraps a <tt>ChunkRaw</tt> instance (content allocated and filled
  * only if BUFFER mode). It should be short lived (one instance created for each
  * chunk, and discarded after reading), but the wrapped <tt>chunkRaw</tt> can be

png/src/main/java/org/xbib/graphics/imageio/plugins/png/pngj/PngWriter.java

@@ -36,24 +36,22 @@ public class PngWriter implements Closeable {
      * Current chunk grounp, (0-6) already written or currently writing (this is
      * advanced when just starting to write the new group, not when finalizing
      * the previous)
-     * <p>
      * see {@link ChunksList}
      */
     protected int currentChunkGroup = -1;
 
-    private final int passes = 1; // Some writes might require two passes (NOT USED STILL)
+    private int currentpass = 0;
-    private int currentpass = 0; // numbered from 1
 
     private boolean shouldCloseStream = true;
 
-    private int idatMaxSize = 0; // 0=use default (PngIDatChunkOutputStream 64k)
+    private int idatMaxSize = 0;
-    // private PngIDatChunkOutputStream datStream;
 
     protected PixelsWriter pixelsWriter;
 
     private final OutputStream os;
 
     private ChunkPredicate copyFromPredicate = null;
+
     private ChunksList copyFromList = null;
 
     protected StringBuilder debuginfo = new StringBuilder();
@@ -64,8 +62,8 @@ public class PngWriter implements Closeable {
      * Sets shouldCloseStream=true. For more info see
      * {@link #PngWriter(OutputStream, ImageInfo)}
      *
-     * @param file
+     * @param file file
-     * @param imgInfo
+     * @param imgInfo image info
      * @param allowoverwrite If false and file exists, an {@link PngjOutputException} is
      *                       thrown
      */
@@ -118,12 +116,11 @@ public class PngWriter implements Closeable {
 		if (currentChunkGroup >= ChunksList.CHUNK_GROUP_4_IDAT) {
 			return;
 		}
-        int nw = 0;
         currentChunkGroup = ChunksList.CHUNK_GROUP_1_AFTERIDHR;
         queueChunksFromOther();
-        nw = chunksList.writeChunks(os, currentChunkGroup);
+        int nw0 = chunksList.writeChunks(os, currentChunkGroup);
         currentChunkGroup = ChunksList.CHUNK_GROUP_2_PLTE;
-        nw = chunksList.writeChunks(os, currentChunkGroup);
+        int nw = chunksList.writeChunks(os, currentChunkGroup);
 		if (nw > 0 && imgInfo.greyscale) {
 			throw new PngjOutputException("cannot write palette for this format");
 		}
@@ -193,12 +190,9 @@ public class PngWriter implements Closeable {
 
     /**
      * Queues an ancillary chunk for writing.
-     * If a "equivalent" chunk is already queued (see
-     * {@link ChunkHelper#equivalent(PngChunk, PngChunk)), this overwrites it.
      * The chunk will be written as late as possible, unless the priority is
      * set.
-     *
+     * @param chunk the chunk
-     * @param chunk
      */
     public void queueChunk(PngChunk chunk) {
         for (PngChunk other : chunksList.getQueuedEquivalent(chunk)) {
@@ -344,8 +338,7 @@ public class PngWriter implements Closeable {
      * This is kept for backwards compatibility, now the PixelsWriter object
      * should be used for setting compression/filtering options
      *
-     * @param compLevel between 0 (no compression, max speed) and 9 (max compression)
+     * @param complevel between 0 (no compression, max speed) and 9 (max compression)
-     * @see PixelsWriter#setCompressionFactor(double)
      */
     public void setCompLevel(int complevel) {
         pixelsWriter.setDeflaterCompLevel(complevel);
@@ -416,6 +409,8 @@ public class PngWriter implements Closeable {
 		if (rowNum == 0) {
 			currentpass++;
 		}
+        // Some writes might require two passes (NOT USED STILL)
+        int passes = 1;
         if (rownumber == 0 && currentpass == passes) {
             initIdat();
             currentChunkGroup = ChunksList.CHUNK_GROUP_4_IDAT; // we just begin writing IDAT
@@ -440,14 +435,11 @@ public class PngWriter implements Closeable {
      * This should be overriden if custom filtering strategies are desired.
      * Remember to release this with close()
      *
-     * @param imginfo Might be different than that of this object (eg: APNG with
+     * @param imginfo Might be different than that of this object (eg: APNG with subimages)
-     *                subimages)
-     * @param os      Output stream
      * @return new PixelsWriter. Don't forget to call close() when discarding it
      */
     protected PixelsWriter createPixelsWriter(ImageInfo imginfo) {
-        PixelsWriterDefault pw = new PixelsWriterDefault(imginfo);
+        return new PixelsWriterDefault(imginfo);
-        return pw;
     }
 
     public final PixelsWriter getPixelsWriter() {

png/src/main/java/org/xbib/graphics/imageio/plugins/png/pngj/chunks/PngChunkBKGD.java

@@ -5,11 +5,7 @@ import org.xbib.graphics.imageio.plugins.png.pngj.PngHelperInternal;
 import org.xbib.graphics.imageio.plugins.png.pngj.PngjException;
 
 /**
- * bKGD Chunk.
+ * bKGD Chunk. This chunk structure depends on the image type.
- * <p>
- * see {@link http://www.w3.org/TR/PNG/#11bKGD}
- * <p>
- * This chunk structure depends on the image type
  */
 public class PngChunkBKGD extends PngChunkSingle {
     public final static String ID = ChunkHelper.bKGD;

png/src/main/java/org/xbib/graphics/imageio/plugins/png/pngj/chunks/PngChunkICCP.java

@@ -5,8 +5,6 @@ import org.xbib.graphics.imageio.plugins.png.pngj.PngjException;
 
 /**
  * iCCP chunk.
- * <p>
- * See {@link http://www.w3.org/TR/PNG/#11iCCP}
  */
 public class PngChunkICCP extends PngChunkSingle {
     public final static String ID = ChunkHelper.iCCP;